This reverts commit ca0b5fd5a661627cfe814d3ff4e268486eee7058. Change-Id: Iec420cb2e5482911062acdf973d12e8a3f2a5432