@vouillon, do we still need this ?