This reverts commit b8e3f209af70a7707be75d866b142dc1fccc8d5f. Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766