Revert "Merge pull request #65 from midiotthimble/v2"

This reverts commit c80f0a2475319893309b318f7127805b3796f575, reversing
changes made to 2200f1239905ee4dad7cf3cb84c046dcda1badb2.