Chasing latest patch in https://drupal.org/node/2217877.