Revert "Tweaks to get r2r in the right place" This reverts commit 87fc48564e379f6392c29f266c562644054deb09.