027a0fb35f
This reverts commit d87722d396.
Reason for revert: causes b/383976643
Change-Id: Ib862599e84a6f61133819797a1ba51b79fe1f745