MDL-64506 grades: Fix regression of MDL-58428