revert refactoring