Don't differentiate the protocols used when using direct SSL/TLS versus STARTTLS

Patch by Alessandro Di Federico