This reverts commit 9b5c847a19bf7dbfe3fe00f11cbbdf581794fccc. Change-Id: Ie9e6ba685654622a9a1e76a405cc4d47477d9e13