I would like to remove the changes of diego for now since nobody will
ever want to try 3.9 if this is that sluggish. I asked two times diego
if he would enh them and got no reply so if he wants we can of course
reintroduce the changes.