Revert "Merge pull request #46 from peterarenot/master"

This reverts commit 9287e379c4c6da66ce6f8f07ede4a9ddc2bd7dae, reversing
changes made to f01546332e7caec1e578c13e79b6730b0d78add2.