My guess is either you sit the CAD or accept the restrictions. That's a guess of course but we all know there are CVD pilots out there who had the restrictions lifted on tests that are no longer offered. The only other option is to get the cash together and run a class action in the federal court of course.
I would say they'll offer the CAD instead of the Farnsworth as well.