Revert "Merge pull request #2 from migstopheles/feature-2"

This reverts commit bb30cc2a02c36ac7f3a20a8090dba7170e0c13c2, reversing
changes made to bf5a36278136a7efb62603411358f94d8e2602f8.