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