SOS-1585 Cannot confirm a connection.  Rollback of SOS-1578 (reverse-merged from commit 9db5740b63d32d588927a764dd4786482ff0e342)