Diff for A/9dcc06cb842411849139d05a3d6aacfc (Commits: e01eb8, e01eb8, Removing prior association method. )