This reverts commit 07358dfe. Merged-In: I2e52c3abdd13fa0547a510b3599e082e3bff0989 Change-Id: I2e52c3abdd13fa0547a510b3599e082e3bff0989