Testing a faster boot.
0.9.6-22
0.9.6-23
Small speedup
0.9.6-24
0.9.6-25