Fix dependency lost in upmerge