This reverts commit aef5aa78. Reason for revert: Causing boot failures BUG: 217335654 Change-Id: I41e47b88ef7663804de4a04928be4eb08ad83f73