Revert "Try to reland Ib3ee007bc"

This reverts commit b6415618f1c5e72c44bf342cf4bd8667ebb8abff.

Reason for revert: Caused regression of b/149213586

Bug: 148639826
Bug: 149213586

Change-Id: I5248e03b42e3f24a6e2abb134d0bf339e77f484b
3 files changed