Revert "Merge pull request #119 from waffle-iron/master"

This reverts commit 8999ff52dc584396f5f6826c65faf67720143fc4, reversing
changes made to 548f5db5590e8e4ec9520309b55d6dc118cf7b0b.