This reverts commit 36c5679efc. Reason for revert: <INSERT REASONING HERE> Change-Id: Ib2d1084ea21461f70f96f95c6025a08f88288357
36c5679efc