This reverts commit 8cb3e6aa. Reason for revert: boot time regression Change-Id: I5e6dc8e80d33256cf7dd8c0d5f1415373fba9048