This reverts commit f762496b7f.
Reason for revert: continuous crash, blocks LON from working on master
Test: flashed build from TreeHugger and verified that it boots and doesn't crash anymore
Bug: 72270082
Change-Id: I68d771357488c5c17ab00803d8f51a6c7ed37d01