Revert "Merge pull request #300 from jpcody/master"

This reverts commit 36836fa5e7c084c0dce2818577e6fd0cf815f786, reversing
changes made to 53bc8426648cc93695525e8f12102cd416b2d772.