Revert "Merge pull request #25791 from gasolin/issue-1089511-3"

This reverts commit 60d2ad46dcd3c608b1ebbc885f17216c507a204c, reversing
changes made to 929a3e9be64ec0d685ae75efbd4aaa4d7fd7cc08.
Merge pull request #26408 from gasolin/master

Revert "Merge pull request #25791 from gasolin/issue-1089511-3"