... by reverting an upstream commit /cc #15697. I should make some distro pay me for digging into such things :-)