Pushed this patch to guix master as commit e7859da11371e9bd0fffc5235b9e980cccf4b239.