43eee35 fixed this particular issue, but introduced a regression that was promptly reverted in#8023. We should probably combine elements of the initial commit with strong testing to resolve this bug.