These changes can now be reverted since the global admin *can* override on the tenant, if you think it's worthwhile to make this PR smaller