Revert "Merge pull request #535 from Fleurer/patch/1"

This reverts commit d45f145197612f2b012d7dc3522949e719568371, reversing
changes made to 13de51105bcf927cbd01d05b69c695ddd3bfd1b9.