apply the patch from http://drupal.org/node/1568066#comment-6198042