Revert "Merge pull request #1 from jbout/patch-1"

This reverts commit 21f41472fb41fc317fa26f522275849a14abd6a5, reversing
changes made to 4ab7b2484d1a6bb72ee3f2f5b24aecd180c072d2.