Reverted changes to classic++ so that we're comparing against the right thing.