Revert "Fix for SMTP TLS based Auth"

This reverts commit ddc293a218ee3983bede644a329c4a968bc14f24.