Merge pull request #2334 from pyca/alex-patch-2

Don't use pipes