Comment 5 for bug 1987236

I have made a test snap available on channel edge/test-lp-1987236.
It contains a speculative fix from the linked merge proposal that I think should work, but am not able to test personally. Testing assistance would be appreciated.