Use service destruction to fix the bug

Alex Pottrequested to merge
issue/drupal-3405976:3405976-minimal-approach into 11.x

Closes #3405976

Merge request reports