Revert "Original CL: https://android-review.googlesource.com/#/c/51435/"

This reverts commit 1e4ed7eccfc9ca7aabb09a87111a5e31ce4a476e.
1 file changed