Remove an ugly hack to make re-spawning work