pre-2.3 CVS HEAD