This reverts commit 94c8670e. Bug: 123424163 Reason for revert: Fails boot Change-Id: I9aa6a296275d1a2e19cb3801d9082293b2b400f0