Confirmed working in the reproduction test case I provided in the PR. Will test soon on the production-like host on which I initially found the issue.