partially revert 65fc1bb2d5ffde079ed7210be6bd6dd36330fa80
partially revert 65fc1bb2d5ffde079ed7210be6bd6dd36330fa80

France-ioi/commonFramework,France-ioi/commonFramework,France-ioi/commonFramework,France-ioi/commonFramework