9b3dd6c0b9
This reverts commit 22be1a47f4.
Reason for revert: Breaks another test
Bug: 202546679
Change-Id: I796c508a6d7c00ec8c1d48e3517453f9eca0616c