Revert "improved startup time a bit"

This reverts commit da20e233fcb8eabe1913ad3541fb6559f9240589.