Jean85 Partially revert 19764b1