Refactoring #4388