Revert wayward animation changes

Also added comments to make sure changes made for good reason are not
removed
Merge branch 'revert-animation-changes' into staging2