Revert "more link fixups"

This reverts commit 6b4d80b6f2e492a969b2cc0da6e1b5df0c2a73ff.
6 files changed