Revert r1057532. It was an automatic merge I did. There was an error and I have not enough time to do it properly by hand