Revert "Merge pull request #436 from wirde/master"

This reverts commit 4d748aa75bcd73d2bf99a3363afe6adfb7df8515, reversing
changes made to 050f2083e83f1589527e8e0898ffbeac91dcf059.