This reverts commit a32f6da9cea107b5a2c8d95c2566e1f1af1a7cce. Change-Id: Ic023d701d18f0ae7af2579bc43777714a0e701dc