Preview Merge to new walkengine
Revert "Preview Merge to new walkengine"

This reverts commit 9dcecb86a70a322af41e7e949c7d73c0ba64c1f5.