Fix #2067

[dead-claudia]

Description

See this comment for some more detail on how I came up with this: #2067 (comment)

The tests were a bit of a challenge as it was easy to screw up the repro by "simplifying" it. It's a very subtle bug that's hard to repro.

Motivation and Context

Fixes #2067
Closes #2431 (that fix was incorrect - my bad @boazblake)

How Has This Been Tested?

Wrote the tests, made sure they failed with the patch commented out, and made sure they then succeeded after the patch.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Documentation change

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.
• I have updated docs/change-log.md