Revert refactoring