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