Resolve #3390360 "Head broken"

spokjerequested to merge
issue/drupal-3390360:3390360-head-broken into 11.x

Closes #3390360

Merge request reports