This reverts commit b11924806c458751dd2d2f87403fc1f1f1403573. Change-Id: Idd9d8ed240fe6ee0d9fd07b29a3302f936f7caa8