This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189. Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e