Revert "Merge pull request #26621 from chirarobert/bug_1107460"

This reverts commit 46eeeb16a6285d02a2230355e8b8e59d0dd896f1, reversing
changes made to a208afd47dd0f9633068ada61bc9829b5a2bed7a.