Revert half-baked changes in SslHandler that were pushed mistakenly