Revert r42936: Revert #6750 and related tickets

Please see http://twistedmatrix.com/pipermail/twisted-python/2014-November/028912.html for more details.

Reopens: #7548


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@43428 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Revert r42943: Revert #6750 and related tickets

Please see http://twistedmatrix.com/pipermail/twisted-python/2014-November/028912.html for more details.

Reopens: #7545


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@43429 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb