OK? Or do we want to do that backport from https://bugs.gentoo.org/952307#c2? The latter would get no testing anyway as shadowed in ~arch, so... (The threads change sounds scary but maybe it's fine and the function was a noop anyway, so would need some investigation if going to do that.)