Looks related to http://drupal.org/node/1274518#comment-6188606