This reverts commit ee47dea9. Reason for revert: <INSERT REASONING HERE> Change-Id: Ie26a7b08cb2d86c71f3d8c8c509d9803d0ad293b