Possible fix

Lee Rowlandsrequested to merge
issue/drupal-3487031:3487031-performance-degraded-after into 11.x

Closes #3487031

Merge request reports