Done in #ad39266