Reinstate the auto-upgrade from unencrypted to STARTTLS, if possible.