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

This reverts commit 31534ec287e39c3627302ce03356eae9e5d01c61, reversing
changes made to f7f76732856418979ffc7b83b20dc7d3bb9a52d7.