I used to be familiar with that code and I find a 1600 line patch a little daunting. Who's testing which board?
If a board can not be tested, I think it ought to be left alone or removed. Otherwise you risk leaving a board in a broken state, which someone else will discover at a later date.
ron