This reverts commit 31c6a68fce. This fails tests for me, I think it needs a backport of c1d8461ee34c6d3f987e0f19191f2105cb2a33c8 upstream, but I can't test that right now. Signed-off-by: Sam James <sam@gentoo.org>
31c6a68fce