This reverts commit 454aff81. Reason for revert: Causing boot failures BUG: 217304780 Change-Id: I5a5591a4684677ce7d47782ebe78f1158a5b0b05