Tore out some of the uses of ConnectionStage (ty Morgan)