fixes bug 929197 - refactor use of connection objects, r=selenamarie