Revert "auto link discovery"

This reverts commit 70e71565c23fa501907b20799410a0c6bb2b1137.