Issue #154: Applying patch to prevent EFQ regression: https://drupal.org/node/1550454.