Revert "[VA] I28 testing new movement schemes"

This reverts commit d1e2b37ff02ae8400886adc4ee5907e0150821e2.
Merge

Merge