Revert "Merge pull request #1 from tleyden/master"

This reverts commit 48690ed4ceb69e40f246c01d871063729cfa66f0, reversing
changes made to e99d8db779c3d18b582a14bbcba1bc994c80542c.