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