Revert "Link fixes"

This reverts commit b8a1544a8653edb2099d1f6df14ad24fcbde2bea.
Link fixes