Merged https://git.savannah.gnu.org/cgit/guix.git/commit/?id=d7d779a3eff9d7875d491e4180da665f6d2a1b86