Resolve #3485896 "Attempt simplification"

nicxvanrequested to merge
issue/drupal-3485896:3485896-attempt-simplification into 11.x

Closes #3485896

Merge request reports