this stuff is probably obsoleted, but get rid of CVS Id tags causing merge pain anyway