341cab18d4
This reverts commit d334cf7263.
Reason for revert: This is blocking our merge -- will temporarily revert and get the merge in
Change-Id: I701521845e3f801501a467b811df580fd825e91f