This reverts commit 344b0d18. Reason for revert: Not the CL that broke the tests. Change-Id: I38221d1ac723e5ea71cb398401e2fda8dd2d7db9