Revert "Merge pull request #26 from gaich/patch-10"

This reverts commit a8cc862752bf3fcb89b1f1b6fa5b1ebbe9b4c543, reversing
changes made to 82a95c98cde2ed3be8e7fa34bcb8cd75a3d189f2.
Revert "Merge pull request #25 from gaich/patch-9"

This reverts commit 82a95c98cde2ed3be8e7fa34bcb8cd75a3d189f2, reversing
changes made to 0dc14622af19d5a4926e69778dd6fbb307ceb578.