Revert "Merge pull request #365 from y-a-r-g/master"

This reverts commit 3fc02e7c82eb1c83f5efe5edbbf27ab9ff31b956, reversing
changes made to b098bb131a19d4d182eb0c42028d9d4d4fa07e79.