Revert "Merge pull request #5 from thewilli/master"

This reverts commit 509f32ebe781a3c95bee92d3f8015d2e92b9bbce, reversing
changes made to eeed2c2c5200e4b7748f4b7350066b3e2dc67343.