Although this was fixed in glibc 2.25, we now have a need to work around it for systems with older glibc versions.  (Otherwise "make check" will break on reasonably current Linux distributions due to the negoex tests.)  I am reopening this and clearing the nochange tag.