Revert "Merge pull request #3 from deanearlbartolabac/enhancements"

This reverts commit 39d3ab951216f2c93a4bb3b52f7d62a363e7290d, reversing
changes made to c645171ed386e8d4031a4a886b5d6c5fe41d604a.