remove patch applied upstream