Revert r43431, a.k.a. re-apply r42760.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/log-booyah-6750-5@43433 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb