This reverts commit f980f54a. Bug: 74950017 Test: manual Change-Id: I793ec0f6c2ba6a141481f8d03e85b791dd8a73d1