….8.2-RC1)" (#25064)

Fixes #25058, vibe coded

Prompt:

> Help me fix #25058. 
> 
> - Reproduce the problem locally manually or in the unit test harness
> - Analyze the code related to the problem and the `git blame` of that
code to understand the history
> - Investigate the root cause using `println`s and other debugging
statements
> - Propose a theory for why the problem is happening
> - Implement a fix
> - Verify your fix using the unit tests
> - Review up your change by running `git diff 3.8.2-RC1` and analyzing
the diff to find unnecessary changes that can be
cleaned up or areas where your implementation can be simplified or
improved
> 
> Repeat as many times as necessary until the issue is fixed with an
acceptable outcome

_Almost_ one-shot by claude, except it initially jumped to coding a
solution blind without testing, against my explicit instructions, which
of course was wrong. After reminding it to reproduce the problem and
write a test and make sure it's red/green, it came up with this PR
[Cherry-picked a3a3fb8]