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

This reverts commit 3e29ecc48a213fba627bd862c578fa0ef0e69a00, reversing
changes made to b0af735948c8953d9bae118222c72f2f962d57c2.