Remove a now-unneeded(?) hack
Use the looping portion of the animation to calculate the velocity
Avoid applying the animation when resetting it