This reverts commit 7994773b. Reason for revert: broke build Change-Id: Ib146556187088f57ec6aec0216ed1b4b270d8c9b