Revert old forking code