Emergency fix for stale grades not being overwritten by None. Will
become obsolete when Aggregates are refactored. [14265639]