Now that cl 196153 is in. This reverts commit 987e44e6. Bug: 26510411 Change-Id: I006d7532973a6e26adde99e04f8b3eab491b3901