Un' along in recursive call in
Closes PR 12600. original commit: 678941ce5aaf52a9ca62ba6270a89c892b85b516