Revert walk/map pull requests