The entrypoint of a method can change concurrently. Bug: 35800981 This reverts commit 178dce79. Change-Id: I25ae8d0d2830eb8412c52f61736bac7b16281c11