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

This reverts commit 91b56486b137d98744c1d7dbbef7ede769571de9, reversing
changes made to 5d9448b86bc98b211926ffa4c0d87712e2e0fb97.