Apply the patch from http://drupal.org/node/1832544#comment-6694946