Revert "Et on merge"

This reverts commit 8b68ff622e4769dc250c070c693a20c7d6f446bd, reversing
changes made to f29dc35b67ed14c2f23a76c5e7b369bf722797a1.