This reverts commit bda2bb39717accd08fe56f997b7a46e56f997c5d. Change-Id: I734cce1d0fdccefa64577b7e0ba68f8afdbfb2d6