Revert "Issue 25010"

This reverts commit 2ee40903dd34653acd6debcd7229bbe6278f12c7.