Revert breaking commits for ecf transport:  JBIDE-14638

Revert breaking commits for ecf transport:  JBIDE-14638