Sync with upstream master and revert patch for bz#737223
    
    There was no rationale given for the change to fix bz#737223 and the
    fix was never even proposed upstream.  This patch causes a test
    failure in the glibc testsuite.  Revert the patch for now and do a
    proper documented analysis if this actually results in any kind of
    failure.