Issue #1813: merge changeset that reverts a glibc workaround for the
Fedora buildbot.