Fix non-starttls servers