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