Code Review By Rock Zhang
This reverts commit 8f72d0d0, reversing changes made to 41a9eee3.
…feature/yoho-coin-new