Just a follow up, if somebody else stumble upon this. There is a small working patch (actually a revert)
https://bugs.freedesktop.org/show_bug.cgi?id=62564