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