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