Revert "Merge pull request #61 from ikeqiao/1.6-dev"

This reverts commit 955f112034a82c4cbed823ddba666a996be6a038, reversing
changes made to a79d22bdd76a27aa5a0cd743ab7d45bf8e072f91.