Revert "Merge pull request #834 from Daemoen/master"

This reverts commit 230ab2722ebd399afcf64c1a131f4929f602177d, reversing
changes made to 659553b21ddd7504889ce113a816c1db4a73f167.