Roll back some of the major changes to animations