This reverts commit 2b44387f5d. Bug: 35374151 Change-Id: Ifdde7a3b4e9141d7e283478aff49971c6a5dcaa2
2b44387f5d