This reverts commit 30d48351. Reason for revert: The underlying issue was fixed in ag/23603641 Change-Id: Ibe2749c3bb7412132de6d96d178f54cd8d1d0666