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