Resolve #3624030 "Broken 11x"

Stephen Mustgraverequested to merge
issue/drupal-3624030:3624030-broken-11x into 11.x

Closes #3624030

Merge request reports