Revert 39295 on request of hpoussin