Refactoring #29859