This reverts commit aaab02a91fcb33388d958a6402b2e77481a0d5b2. Change-Id: Iabc3684a9a8c2f9a781029f55120f0346ee9b289