Revert "Merge pull request #2371 from RafaelMarinheiro/master"

This reverts commit f257e0ea6b9aeab2dc7af3207ac6d29d2bbc01d0, reversing
changes made to 8f0c6bd7732331186b66118d4613cd0dc7076de4.
1 file changed