In order to apply this PR, it'd still be helpful to include a test case to use to 1.) reproduce and 2.) prevent regressions.