This reverts commit a5c14e28. Reason for revert: No longer needed. Bug: 73281388 Test: Treehugger Change-Id: Ifbfe2905b23431ea1f9ef8950451ee911593955d