remove patch http://drupal.org/node/1887686#comment-7147008 has been comitted