Revert "Merge pull request #2 from cctuan/930948"

This reverts commit 48236316fd581f19b65d5e6d2f14c407b20d3636, reversing
changes made to 0798f4d7f85f446220f3dd00fa52a04aaf29bc33.