Issue #3122548: \Drupal calls should be avoided in classes, use dependency injection instead