This reverts commit e454a698. Reason for revert: Causes b/270178573 Change-Id: Id1def9a9f8cfa7261c4914cd846732f09b247128