Pushed this patch to guix master as commit a3df382525ac515d1aa083f7f5bd3bd31eb1df40.