#2367779: Fix regression

https://www.drupal.org/node/2367779