Reason for revert: Some tests still failing, reverting the original CL. This reverts commit 57b4e13d. Change-Id: I49d9da676be7a1994b39ea9046c8d62695ff8422