applied patch
remove comment and use Drupal::service()