Revert "derp"

This reverts commit a10ac1a34e6b0f4acf6bce72ce99b7c23aa90eea.
Revert "squash of Vanir animation control from 4.3"

This reverts commit 49e56e679348affe0ab054e547ab542d5f55d8c0.