Remove temporary fix for Drupal-extensions module.
Merge branch 'SCHOLAR-3.x' into 1017-quick