c314e4236a
This reverts commit 998572e105.
I see this update as causing too much trouble for now;
in time the upstreams will hopefully address the regressions.