Revert "Merge pull request #23 from RickyChien/bug-998776"

This reverts commit 69a45b5c7654825a6d12b7308cb62d23a1d4de24, reversing
changes made to b7d10840775e9699e60881f662794121b5800cc5.