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

This reverts commit c074be11766883dfb30e3d62e9e6f43465917bba, reversing
changes made to b03d83eca75c1c22555fcd465a575d0710236147.
Merge pull request #2 from Gaojiquan/revert_pull_request_1

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