Re-Applied http://trac.symfony-project.org/ticket/8492