Like upstream but with a one line, 18 month old bug fix.