Disable the fix for pr20793 because of a gnu ld bug.