Remove the part of the patch which has been accepted upstream.