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