Refactor #10071 firstchildredirect