I used (substitute*) instead of a patch file and pushed as 18d9d22adc2050717c97a1d35ce876ee93395d76.