This reverts commit 9e24109f.

This caused build errors when building without openssl, and it's
simplest just to revert it.