Revert parts of _Rogue_'s repair as they removed new code