Revert refactor patch and its release patch