https://github.com/symfony/symfony/pull/10600/files#r11152517 has been addressed here