Revert "Merge pull request #132 from LasseSviland/master"

This reverts commit 2e909ebaef4dd9b2226197d44dc9c7effb098b34, reversing
changes made to 099857bfb8d95654ef97f9afe0dd4f9ce92bb449.