Revert "Merge pull request #3 from jleo3/3_branch"

This reverts commit bb56559b532d49657320d94a67a23906cf274360, reversing
changes made to 5dc1d451479b9ab7e70cc54ca8597947b12d4a1a.