Un-break patch-files