Previously it was calling other algorithms directly which will not play well with the history Re #32125