Merged in https://git.savannah.gnu.org/cgit/guix.git/commit/?id=8e73bf754f95fac5a383b90405e741d1cf1aaeb9