Done. Patch can be found here: https://issues.guix.gnu.org/54563