This reverts commit 709b5f7d. Reason for revert: Commit 5c228d5, on which this CL is based, was reverted Change-Id: I9326e2bae3e9b06ec7e0ede65e878bb8b4c20224