revert refactor