Revert "Fix for SMTP TLS based Auth"

This reverts commit 764af4ce5dad66e3fd229d8f9e7e88fc9bf4bdcb.