Upstream now incorporates fix we had patched locally