Comment 4 for bug 1827923

Not much else to do pending upstream feedback. This doesn't seem like it's important enough to warrant patching without upstream's lead. Please let me know if this turns out to be more essential to land - patching it shouldn't be difficult.