Revert "Merge pull request #240 from atilag/bug-1056337"

This reverts commit 29b0726540f3422405c0c5751d3a43b99fee5b01, reversing
changes made to 6a0e874efc38e560d6f38b7da431798f5e878b44.
Revert "Merge pull request #239 from atilag/bug-1056337"

This reverts commit 6a0e874efc38e560d6f38b7da431798f5e878b44, reversing
changes made to 53a09b32c170d171e484cc8d14d1e87645cc2389.
Revert "Merge pull request #231 from atilag/bug-1056337"

This reverts commit 53a09b32c170d171e484cc8d14d1e87645cc2389, reversing
changes made to 8b8379d3b433275de2be9bdb5663e1dbff727b52.