This reverts commit 59f63bd801. Bug: 73134570 Change-Id: I6ace34b0d6545ff001664792b0bb1bbff5b5cbbe
59f63bd801