The ClassDef number was not increased in MR73557 but should have been increased. Make up for this.
@jahreda, @brosser, @tbold