Re-add non-teams support to SkyWorldHandler