If you're gonna hack the patch manually, do it properly...