This reverts commit ccfe71e7. Reason for revert: Roll forward Change-Id: I825293f47a74a823261415f27260485c6743a973