Latest CVS commit *may* have changed to much