This reverts commit 03599a4c8fcc539948174136878f5e0ceec1eeda. Change-Id: Iacd5f7ecd755ee2c8efdf1e37060a21702bcf08a