Remove old bandaid from VCL1->VCL2 transition.