Revert "[12/01/2013] MERCHE CON MASTER"

This reverts commit c051f0d352be05f70c05d6b7475c03285192bbe1, reversing
changes made to ac9ac6a66834420084e0e4020ec4ee50777628d8.