I combined this patch with <https://issues.guix.gnu.org/70965> and
applied the result as 1bb9da089586cec646925d226a198757af1e0b71.
Thanks.