Use fix f572f8ab2667d01e78b7302b66b3dab0cc6363a3 because it broke moving-finishing.
Fix case where entity gets stuck in move cycle.