revert tweaks for cond py27 ssl problems, upstream appears to have fixed it