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