Hello again!

If you are able, please take a look at patch #45062 linked below.  I've
slightly modified Michael's patch and added one of my own to take a shot
at solving this issue.  If it passes review (or no one says anything for
a while), these changes will be applied to Guix proper.

The patch is here: https://issues.guix.gnu.org/45062

Thanks,
Kei