Remove term_link from master, added in patch-2