Revert "Merge pull request #1 from bmwirth09/master"

This reverts commit aca58b2bf56b87dbe5e5cb6dad59ff1f190b4b89, reversing
changes made to 4cda60ad8d3864dd75a4817a0de020b5f5030420.