Revert "Merge pull request #24127 from ddrmanxbxfr/bug_1062829"

This reverts commit a416d1e2c1f82631de19ba476cb110304d0105c4, reversing
changes made to 3563ddca35a52e7a533dcfc7996e74b78c6e36c8.