Patch applied to guix master as commit 4fc4e5fdd9da6320aa94eeec61cbb84a7dc9460e
for now.