Revert "Merge pull request #966 from ruben-alcala/master"

This reverts commit 1fc7bafb8edf998a3ee3efd6c73c57e671ebaa60, reversing
changes made to 67d3eddd716c2e8e02dabf1df8d322b5b9fb611f.