This reverts commit 69b5a5f0. Bug: 307824623 Test: Presubmits Change-Id: Id7dd1518ae6b04232c48c0aa138cad2c59b228c3