FOR-157 Applied patch from https://www.drupal.org/node/2274001#comment-8879759