TS-1487: More startup order tweaking, based on reported crash.