Revert "Merge pull request #176 from LegNeato/master"

This reverts commit 9bc7cbe12e76d1511db1db73e2e5c3abd351ccdf, reversing
changes made to 8190d28045acec05427bd7708d6f41fef4352f7e.

Our tests are breaking! Nooooo! D:
Merge pull request #182 from ryanrhee/156

Revert "Merge pull request #176 from LegNeato/master"