Issue #3291939 by tim-diels, Rakhi Soni: \Drupal calls should be avoided in classes, use dependency injection instead
