Pushed to guix master as commit 19b310901c9d798722e6be849e335efc1fee0384.