This reverts commit f750a9e5. Reason for revert: keep treehugger green Change-Id: I65543f6d3e2a242d594014911b8d880937e5e044