This reverts commit 574aea0f. Reason for revert: Crashes sometimes (chaselist issue) Change-Id: I1440ef7a002e85c3e020d424f13073ca2516dd9c Fixes: 73991490