reapplied change 1.61, due to a CVS conflict.