Refactoring to undo refactoring