Merge pull request #19017 from eileenmcnaughton/remove_recur