This reverts commit e1954f30. Reason for revert: Breaks all internal tests. Bug: 64382372 Bug: 77733081 Bug: 72430785 Change-Id: If6138ee1a3d73059b20c582c0dfd388ff07507a2