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