Sorry for the regression. I believe Michel already has a fix for this, see https://patchwork.freedesktop.org/patch/70592/