Refactor #9673