Revert animation duration changes

This reverts part of b84ecb2