Sync rebuild of cvs_head