This reverts commit 70425d96c2df4352322c3b6bfabdf8686e3d4391. Change-Id: Ic280153a0c9e05d531a34ac6ac09178ec9dd71c3