re #7747 Refactoring