Un-blas the main branch.  Bug in CD1 still present.