Revert "Merge, le bon"

This reverts commit 5bc8f5432d1749a87220249443fd54d117af4b51.