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