Switch to use a per-world state system instead.