Merge back in the deprecated links from upstream.