This reverts commit 965419af. Bug: 71707409 Test: Manual test Change-Id: I4f1c46183189b454bc981a65b992b80668f7a59a