Comment 10 for bug 1879587

Hey Julien, what fixup do you need on top of Peter's v2?