This reverts commit f87959e0. BUG: 32402587 Fixes: 32365477 Change-Id: Ic4daec37efbaef1906450bf6609d5588d5c9a835