Applied patch #28 from http://drupal.org/node/356893