revert 127010 until Jeremie polishes and fixes the integration