Revert - ClassDef/ClassImp are still needed.