Adjustment for: https://www.drupal.org/node/2377297