How about another perspective on this thing. It may actually be a good thing because as we know the cost of Tornados is high which means ONLY the Olympic teams can afford it. (ok and a handful of others as well)

However, this opens the door to re-introducing a catamaran class at a future time based on a much less expensive boat, say Nacra20. (no F18 since choosing one of the existing F18 boats would favour one manufacturer and hurt the class).