This reverts commit 953858d6.
The original CL should be split into two.

Change-Id: Ic1d032e2964a1b9bb44d98bdb8573c6cb47a865c