I'm a big fan of fixing upstream so we don't have to carry a patch forever. Their rationale I don't understand, but the implementation is clearly broken.