This reverts commit 232a2831. Reason for revert: Roll forward Change-Id: Ia6268a63db726ed3092b44edb23601932a984606