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