Revert "Merge pull request #17683 from gasolin/issue--971538"

This reverts commit 4a2e2032589de749583a3674cb2a433b5a8e8361, reversing
changes made to fb0aec1ef13f915a9739fc889df88ceda07c7b53.