ECMS-5040: Revert code in LinkManager to fix build failse