This reverts merge request !25017 (merged) due to failures. Sorry for that.
FYI @rbielski, @fwinkl, @ssnyder