Revert "merged branch Seldaek/master (PR #4133)"
Revert "merged branch Seldaek/master (PR #4133)"

This reverts commit 00e7a94a8c761a3e10c388e4d06cb3ce4cd04ad7, reversing
changes made to a01dec00f4e8de357cce5fdf121ac98729f7f8ff.

symfony/Propel1Bridge,symfony/propel1-bridge