2fe7dd7306
This reverts commit a50bb39048.
Reason for revert: Causes a P1 bug (b/241165022).
Fixes: 241165022
Bug: 236760307
Change-Id: Icc080d9a37e26d70d0f4cf846a4fd39df3b71625