Remove this->link to match recent trunk changes