Redo the glibc compatibility issues workaround, see comment for details