Refactor #6438