This reverts commit 3830308f. Reason for revert: Caused various SH regressions. Bug: 271036161 Change-Id: Ia785324f83006a095e262c251b24d49fd778427e