This reverts commit a7ee33e7. Reason for revert: Rolling the change forward Change-Id: If6847dbe91e901ca07a0cde402b366b2a3d1f46a