Revert "Animation Improvement"

This reverts commit 7019bc1694498f16c4d3d058aed0744d54583539.