Revert "Merge pull request #14 from VertiPub/2.0.3-chutong"

This reverts commit 3d94498a5a4d21ea9cb9c67cb778fe08d435be0f, reversing
changes made to 341f09eb66b710e6ad7998628242370bee08f771.