Adding bypasses for lack of animation support.