This reverts commit 4d59805c. Reason for revert: <INSERT REASONING HERE> Change-Id: I18af805c5678c14af9926010b5cd7f3e100cad97