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