Revert "Merge pull request #2 from hhzl/master" (no CR's please)

This reverts commit c351da8ce82950426f51d808abc962236126ac68, reversing
changes made to 693e161975b783a8e1031f9fb4da3613cedd97f8.