Revert "Merge pull request #162 from KurtStam/master"

This reverts commit 2d9f2fa0ce6abfabf4f80de53c4004e1119b066f, reversing
changes made to 31c499c76f8d4de447e248517e9b4ceaf00d1d2b.