For ENG-6061, bring back imports eclipse probably disappeared