Reverted to prototcol agnostic link