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

This reverts commit a3831c39bdb40bd33c7e5c318188734a8971630e, reversing
changes made to 471214425e4162b08a55668132f42c8d5da56c18.