Revert "Merge pull request #588 from qwook/master"

This reverts commit 22eb954a0c299fea05f11b055ba54da9352acd2a, reversing
changes made to e2f637ac6253c9c490bd242dcef4167b5ec1c3b9.