Undid broken refactoring