This reverts commit 61b17d64f90b85fd367ea1c7609cac69485957d4. Bug: 19317169 Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d