Re-added field conditional states. Also added jQuery update module to override the default jQuery version of the site.
Fix states.js upstream and remove the overwrite in jQuery Update.

See: https://drupal.org/node/1448490#comment-6270412