Auto merge of #74746 - wesleywiser:stable_backport_73669, r=Mark-Simulacrum

Stable backport of #73613

This is the backport of #73613 to stable.

r? @ghost

cc @Mark-Simulacrum

In addition the tests added in the original PR passing, I've also confirmed that the test case in #74739 works correctly.