Revert "Merge pull request #42 from romilb/master"

This reverts commit 39f1552ca671db08358b2f336649a303836fd781, reversing
changes made to 302a5f9fa9e1dc492d3ee8b4b4b3130ddd9d27a8.