Revert "Merge pull request #23 from Dsteinkoenig/master"

This reverts commit 1047e1bc848af1b7e1a029c317e2777b66b5672e, reversing
changes made to ccba364cfa3896b13c354d03e8a2a87ec2d45226.