Revert "Merge pull request #37 from saml/feature1"

This reverts commit e4ef8ed344e33b54262f6163a3bc51efaebd2ab6, reversing
changes made to 605bb0c3db5a159a4ac0273319ea3f51b2e3b473.