Revert 397a549..6886d45

This rolls back to commit 397a549a32a79bb60aff91ad184f0ac30e8df21a.
Animations now working