Revert "Patch by Claude for #16084."

This reverts commit 2babab0bb351ff7a13fd23795f5e926a9bf95d22.