This reverts commit 2c4955bc. Reason for revert: b/281748524#comment14 Change-Id: Id53bfc8ca6177db05c8b55562c170373d23acfa4