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