Revert last patch and simply disable krb5-18/23 formats if Heimdal
was found (until we know, and handle, the differences).