Reverted: VET-135 Applied patch from https://drupal.org/node/2124813#comment-8252607