This reverts commit 0e879409. Reason for revert: This should have been fixed. Bug: 78118944 Change-Id: I796ff2420ec3682dd54a059175a8428868b75c23