Replace with upstream version of patch.