Revert "Speedup root startup by 10%" (fails roottest)

This reverts commit b7ccff6b7374c8dc8d38fe8a07162e95118a3845.