Revert "Merge pull request #88 from shuwnyuantee/master"

This reverts commit a113107defa6af57135629f1f95a2b84d6ccfbe9, reversing
changes made to d750ddf16df7980e4337d0bc1d904dbd779652fc.