Pushed to guix master as commit 02b32cdda68495344d8e5521db5aeaf5add03797.