Pushed to guix master as commit 8546f4da5b3677001dbda6b3a116f5bdc44ea5c0.