done in ocramius/symfony@d525526