Revert "Merge pull request #1 from BABACHAN/master"

This reverts commit a7e6cd6e7f6892928604a420cca015936c4da74c, reversing
changes made to 1d88f5fce81094f06cbc404c5c0f6e559c907249.