Revert "Merge pull request #293 from pgreyson/master"

This reverts commit 7171a069fe3ee98e924e0e05ff1ae779d1de8e18, reversing
changes made to e7f2283c2117adfcc64e10cb402179746fd88322.
5 files changed