Created by: clusterfack
Should remove 8/11ths of the startup time. Needs testing. Fixes #7389 (closed)