This reverts commit 1911d7c1. Bug: 145882325 Test: treehugger Change-Id: I94ca81c29ef967a489b1e3c34591134fa0bb0b35