Given that the in-tree state has been broken for a week, I think it probably is time to revert the commits that already went in.
It seems that although the patch addressing the issues is not a quick fix, there is a big progress in it already. I propose to see it's status a week later and if it is not ready then to revert existing. Hope there are no other patches in the existing branch complained to suffer this.
