Revert "Merge pull request #292 from lissyx/bug931718"

This reverts commit 895fd4ce2b7a48292c3c122b5e2d5bfc55a48928, reversing
changes made to 16cdd8699b58c1c16889b6362404988bbda45a3f.