This reverts commit 654a9714. Broken, will fix in followup. Bug: 73177368 Bug: 63756964 Change-Id: Ia40be10fd17f1da8279729000865201af99dbb1d