And instead recalculate the marks on demand, i.e. whenever we were previously setting recalc_marks to TRUE.