Handle multiworld reloads properly. Fixes #1555