WIP: attempt at adding changes from Rory's Commit 359b3152 into current master

@rory-smith asked :

I'd like to be able to add back the old rwalk from commit 359b3152 together with everything else in the up-to-date version

This is my attempt at doing this...