making sure tenant_id is not set when tenanting is disabled