Revert "Merge pull request #49 from calabria/master"

This reverts commit e3925b72ccd151590c28b1599fa88d26e7c43a49, reversing
changes made to b5e6cf377b6612355cbfea2178284e1a5206ef39.