#5598: use new version of patch