instead of messing around with changing the upgrade package, I recommend just changing the affected lines by hand, using human knowledge to determine what changes need to be made (machine matching means that the EXACT match must be found, while human logic should allow someone to find the correct area and make the needed modification on top of whatever was previously done.