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