Revert "Merge pull request #18767 from gasolin/issue-973445"

This reverts commit bc203f87fe03416a4c5cd7aacef65642f8200899, reversing
changes made to ecd2547a626408307aea7cf83ad7aa237f7c8835.