Comment 61 for bug 1888723

The current branch for this has a conflict when applied to current master since bug 1913219 was committed. The fix for 1913219 was meant to address the behavior that Erica describes above. I will mark 1915555 a duplicate of 1913219.

Bill, can you rebase your branch?