Sweeping !57846 from master to 22.0. We do not need CLASS_DEF for things we do not write
We do not need CLASS_DEF for things we do not write
See merge request !57846 (merged)
We do not need CLASS_DEF for things we do not write
See merge request !57846 (merged)