Revert "Merge pull request #124 from iBotPeaches/master"

This reverts commit 6ea06d24fd7369521708237506e4eee15bcbadb9, reversing
changes made to ed4ec647db50c32ad830e5f331427014d22d21a0.