Revert "Merge pull request #341 from ericwan78/issue-340"

This reverts commit 4134f7c43d4d3c74e05eb436224c288652e47cf3, reversing
changes made to c8b102bbd296ca5904eff77dbb0141473a1bf957.
Merge pull request #361 from k22mak/revert-issue-340

Revert "Merge pull request #341 from ericwan78/issue-340"