Backing out change from rev 1235255. This change broke these two tests: qpid.tests.connection.ConnectionTest.testCloseGet qpid.tests.connection.ConnectionTest.testCloseListen