Revert "Merge pull request #8741 from albertopq/issue-853379"

This reverts commit 7eecff10bace87bc886fa8a50ad3ee0b1efcfc55, reversing
changes made to 5b22c353580e6f6240fbfd7777c26c610c52a9c2.