CONNECT-315 Remove linker dependency on cords