This reverts commit 7d279c7d. Reason for revert: b/259333954 Change-Id: Ic2501ed074dadd5ac1c74444e325511adc35fdb8