This reverts commit 1e4176d1.
It broke the normal case.

This reverts commit 58ad217e.
It broke the old OpenSSL case.  Back to OSx being broken.