Reverted to linking