Updated for upstream Symfony changes