Revert spawner reordering #1693

Job	Run time
binary (jazzy, main) / jazzy main	7m 52s
binary (jazzy, testing) / jazzy testing	8m 13s
binary (rolling, main) / rolling main	8m 45s
binary (rolling, testing) / rolling testing	8m 40s
	33m 30s

Provide feedback