At this point i'll be reapplying things since 8dbf8edb7128 to 2.7 and trying to untangle where the problem came in.  I confirmed with diff that you've backed everything out to the pre-January state in all branches.

I've had part of those 2.7 patches deployed on 100,000 machines for many months with a zipped up standard library though the remaining bug causing the fix to not work in several situations mentioned in http://bugs.python.org/issue19081#msg208754 is still present in what i'm running.

Thanks for the rollbacks to unblock 3.3 and 3.4!