This reverts commit 7a3489552ca92776c5e2a57c80026216b44005eb. Change-Id: Iddfa86183ff0d189e8dbb5dc535344e064e0d103