Pushed to guix master as commit 169b8f77696600fa56658fc36c175e4740a83b94.