Revert "Merge pull request #2 from omcbride/feature4"

This reverts commit 27a1d2b7c97a904a632c45ad67a0389148d4d5df, reversing
changes made to b41b56bbaff756aa56df96bf7d471da0290d125b.