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