Revert "Merge pull request #1673 from aperrault/patch-04"

This reverts commit c9ea89bdd3bf3d92264cdbd7b0b971237ce34a72, reversing
changes made to 9ed49888fc6dcd2a60d8b8ef73f3508c64206dcd.