384beda472
This reverts commit 4c2e3310e6.
Reason for revert: Lets try reverting this now that ag/17006986 landed
Change-Id: If9311a459ce6250d3f8c8341c1210b8bedd5bbbd