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