Revert refactment