Revert "Merge pull request #186 from sshaw/master"

This reverts commit bbe3f47173dddd1da06444c6da390b3edec948e9, reversing
changes made to 60fe20dba19549b4c9d330f66da47d86a8f1de46.