Revert STT changes

They were broken if you have more than one world.