Revert "Merge pull request 'caguilar187' #52."

I mistakenly merged this in 'master' without realising it. As it turns
out this fork does not work as expected so for now I am unmerging it.

This reverts commit 3ed568cd2df425bf326b6f69597de26b61830793, reversing
changes made to 8c14279e04ff94c51d5e385f5ad3954035f38685.