Tweak-the-patch-to-avoid-error-while-applying-a-patch.patch
