This reverts commit f5bae21c. Reason for revert: Bug: 79860717 Fixes: 80215357 Change-Id: I0768e5ce0a95afe7ff091c0035335437bb33c46c