Resolve #3334920 "Remove references to"

spokjerequested to merge
issue/drupal-3334920:3334920-remove-references-to into 11.x

Closes #3334920

Merge request reports