Moved from CVS + 2.x modifications.