Revert "Merge pull request #12802 from caiolima/bug-815093"

This reverts commit 47b3bdf7a6e9396db6e09ac0453f782953ceda7a, reversing
changes made to 1d832634550de25526eaf93137940f9fd73a4c7f.