Rerolled patch from DO-2833968-74 for 11.x.

https://www.drupal.org/project/drupal/issues/2833968

Rerolled for 11.x the patch from: https://www.drupal.org/project/drupal/issues/2833968#comment-15658953