Amazing!  It actually worked, somehow, up until to a segfault!

But still, revert commit e793a7ae80fb72488e4b8fa0dfca1866d8825b5e.