This reverts commit 615e77f82cee719988e7229aec9ebe0ba0063e9b. Change-Id: Id6f51517faeef0081dfbd940157f0552b850f921