Revert "Enable new test and staging SAML environments"

This reverts commit ea5742ac62417bffc4642a25cd64041bad431513.
Fixed SAML login problems