Pushed to guix master as commit 3feb846420f24ef1c8b3fe310d293c7a2c91e1d4.