Apply 5999-3.diff 

Refs #5999


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/conch-channel-addresses-5999@43520 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb