Fixing #30645 by class override. Reason: compiler changes back to
bootstrap default