For easier merging, revert ths change; it will be brought back in when

the trunk is merged.