This reverts commit 12a3db89. The prior commit was broken a bit; rr will take a little more work to support a 64bit build.
