I build a quick fix KMP containing a few reverts commits in OBS home:tiwai:bnc962535 repo. Could you check whether it works?