CTFMERGE issue should be fixed in NetBSD src, so remove kludge from here