Derp.

Revert "Merge pull request #257 from connor/master"

This reverts commit 74e75a9f46b217c8a17cc19242576137dfc79fce, reversing
changes made to bfb8df9269e7c7b81f66b9603c30a0966468c542.