Resolve #3527408 "Revert change"

Stephen Mustgraverequested to merge
issue/drupal-3527408:3527408-revert-change into 11.x

Closes #3527408

Merge request reports