This change has finally been checked into CVS