The previous refactoring was stupid