Revert "Speedup root startup by 10%"

Check the evolution of the suspicious failures in cdash.

This reverts commit fc133d400878f20b2c182e6a37ca01e87e46f390.