Revert "Cleanup code related to ag/11035582"

This reverts commit a2a1f86dfff9bb6d6114020ee58a447b3964af65.

Reason for revert: b/154068414

Change-Id: I1db0018fa97d5a5380651cf7d04a05a0abd62857
2 files changed