Revert "Merge pull request #25643 from mancas/bug956902"

This reverts commit 5f3126b10569f4f252b2babfba5442b66605740b, reversing
changes made to cebd567d0de3755e2bddbc07a7721a7c67ca6eb6.