Revert changes to the UnitMotion from wraitii's latest commit