This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61. Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f