revert the ill-considered part of 2001-05-23 changes