Pull in upstream fix.