This reverts commit 004e73c3. Bug: 74605221 Bug: 73953366 Change-Id: I1665c3d235434f57a4cd4aa5f082720b83ac10cc