Remove remaining nolink usages.(fixes #12810)