Revert "Merge pull request #172 from tohachan/master"

This reverts commit 4bf32be4e5b0c4f39bd8903d1e8f9fbb1665c52d, reversing
changes made to a9466e7c0e6fc423d5166454206720752f883577.