Fix cert checking and comment match_hostname for the time being