Revert submission 20271402-b6958f1c-2b9a-4faa-bf4e-b1c58372ad98

Reason for revert: Verified culprit for b/263438687. See http://b/263438687#comment4 for verification.
Reverted changes: /q/submissionid:20271402-b6958f1c-2b9a-4faa-bf4e-b1c58372ad98

Change-Id: I2f41719ebf8e11c1e4d11c541a4e5652ef523ed2