This reverts commit 22ab6f2feb. Bug; 125937703 Test: make Change-Id: Iead87b0e1b8078262d7e370b050c2a75dbcda387
22ab6f2feb