Recreate links

Change-Id: I3aee2386653543d5a14d1fdc60d0806548616a29