This reverts commit 6589a07d59. Bug: 68988454 Fixes: 69242304 Change-Id: Iec29dbe302064a6209fbb0a8e7901c9a0f8744c0
6589a07d59