This reverts commit 1f11725692. Reason for revert: Identified as culprit for failing test (b/317887212) -- reverting per go/revert-it policy. Change-Id: Ic32fd0044d8d0e32364e5c646fa11b4eac810af9
1f11725692