Revert "Merge pull request #1580 from YJSoft/patch-1"
Revert "Merge pull request #1580 from YJSoft/patch-1"

This reverts commit 73822f385b6814d600ddc8cd5c8e71f3523b886a, reversing
changes made to 1ec6e1ec7a76094fb76d35e1db2298c974912a98.

xetown/xe-core,xetown/xe-core,xetown/xe-core