Revert 8566d7f..6f039b2

This rolls back to commit 8566d7f6cbca1a0315ac2e255999fc49497407ca.
Symfony 2.3 ready