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