Cheery pick of 9e580dff2742b457c972dfe70c3c8094953810b1 from master. Remove dep