Revert f7b0dee..a4b11ff

This rolls back to commit f7b0deeed23640abb2b30a8d1a970510ff217852.
Kevin Ajout