The patch at https://patchwork.freedesktop.org/patch/122101/ fixes a known regression from that commit -- does it help here?