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