This reverts commit 50cb05b4. Reason for revert: <INSERT REASONING HERE> Change-Id: I2d7b483b0943668b14eec9775f3dd495bbdf10e3