* Revert patch from 2005-03-08 for causing bootstrap failure on