This reverts commit 81174cce67770c4922e604baea6f3f5b661293a9. Change-Id: I9b4132ec2b2389410b49b15b7b2d78f43c552929