Walker improved
Revert "Walker improved"

This reverts commit ce6829fa11cf5f65e84ea1d4c89f4f1d8b027904.