Patch already integrated upstream, removing local patch copy