Revert "Merge pull request #1337 from lwyszomi/master"

This reverts commit a3b3e0a83d2908620c9de81ad71f7fb73824d5fc, reversing
changes made to 41752d0de79a0b7761b532c4edeccbf1e7c8772b.