Resolve #3531516 "Proper fix seriously"

Mike Herchelrequested to merge
issue/drupal-3531516:3531516-proper-fix-seriously into 11.x

Closes #3531516

Merge request reports