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