Revert "Merge pull request #133 from m0t0r/feature"

This reverts commit be19a2fb716415f0a5c736808de3298e1f8dc52f, reversing
changes made to 5258f3599ac0c709a15e2766a0bde38b5095c1b6 until all discussion items have been addressed