Revert "Merge pull request #1 from bluerabbit/bugcommit"

This reverts commit 4278aee8fee8942acfa4090adaa2c49f763f4513, reversing
changes made to 729c108ca11cd745aabf52e7a52b65340601cb6b.