Made it default to the original environment if there's not even a tenant specified.