It turns out that the right thing to do would have been to delete the old code. And I have now done so. And the test case that I got from our testers now runs correctly.
If I can just get permission to check the change in, I can declare victory.
Ok, I've declared victory. I'm waiting for the other side to surrender...