r11685: reverting Lar's change to nistallman from r11224 since it breaks 'make instal...