Own fix for Drupal issue #1981194.