This reverts commit afdc92987f. Also reverts Ib44687b which was a follow-up. Reason for revert: Caused T357929 Bug: T357929 Bug: T354975 Change-Id: Ic6d0b472cc2b26cb7c375bf9a5d2e03a4d6c6a18
afdc92987f