Restore some more lines from v6 of the bridge#2092

greg0ire merged 1 commit intodoctrine:2.17.xdoctrine/DoctrineBundle:2.17.xfrom

greg0ire:broken-compat-2greg0ire/DoctrineBundle:broken-compat-2Copy head branch name to clipboard