With set_default_organization removed as a before filter, we need to fallback to it instead