Revert Refactor