Revert "Merge pull request #516 from soarqin/official"

This reverts commit 2e79f68daaf25257dd043cb6c4aa1199c6fdd2df, reversing
changes made to cdcd1e37141d730aed8c6d45feb94052a62b4eae.