Revert TWC hack for RI map