Remove CRs added in r187370.