Changed and opened PR on Symfony (where I copied it from) https://github.com/symfony/symfony/pull/10006.