Revert animation duration changes

Partial revert of b84ecb2