Fix premature refactoring