Patch applied upstream