Revert "Separating SSL from non-SSL"

This reverts commit 4579583d04d273aeb3edafe0e3c46794374cf300.