Comment 20 for bug 1722185

I think I played with some more, but essentially the current code is just severely broken, even if there are regressions somewhere, they'd be less severe than the current state.