Unfortunately, the upstream bug I mentioned in #7 is for a related bug, not this one, and the patch for it has already been applied.
Unfortunately, the upstream bug I mentioned in #7 is for a related bug, not this one, and the patch for it has already been applied.