This reverts commit 400c63ad. Reason for revert: This was a temporary hack; real fix is in now. Bug: 78357839 Change-Id: Ief100e41bba6b12f2961d05144eafefd34b684dd