Revert "Revert "Speed up boot process""

This reverts commit 43d0ad39eadaf60e65d443124d2f689d2f2f6069.