This reverts commit 3e2e064a1f989228f48e8faf588393a1a5ee1e31. Change-Id: Ib3712076585cba507ef1666e3fb6abb2bedb016f