These changes are in CVS now. Remove.