Revert animation improvements to allow for a clean fix to the variable renaming