Fix for CR https://www.drupal.org/node/1894902 (moduleHandler).