Revert "Merge pull request #934 from PirataNervo/fix-870"

This reverts commit 75d65adb96c9c051743cd4cdad7136b230717162, reversing
changes made to f5e3b08f55f7273b6ec8ecf6dee293381850183b.