Fixes 8197300. Links now point to proper location