Here is a patch (moved from Bug#34641 where it was independently reported).