Pushed as c28b319640..cf4f87986a to master by closing
<https://issues.guix.gnu.org/65074>.

--
Oleg