Revert "Merge pull request #79 from duarten/master"

This reverts commit f142ff26ca5ea93d190527b748e03319271af775, reversing
changes made to ce9d08c8844c2e58a7bf24388e7c0f998a2509c4.