Revert "Merge remote-tracking branch 'origin/ssl_temporary_fix' into development"

This reverts commit a9dcb14578d4941e7eaa225238b6add26390d6b3, reversing
changes made to 4c7a842cf5e0a3d797ef8667aad0090c26f80008.