Pushed to guix master as commit bbf8a309662c8378b817cfb760447cd6f8ce59e8.