@dr2chase requested issue #65808 to be considered for backport to the next 1.22 minor release.
@gopherbot please consider this for backport to 1.22; it is likely a regression from the expand_calls cleanup.
I tested the backport already, the fix is targeted, low risk, and applies clean.
@dr2chase requested issue #65808 to be considered for backport to the next 1.22 minor release.