Revert "Speed up boot process"

This reverts commit 1a4933741f71ea80efd450bf37414fbb74e6922d.