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