Undo patch for bug#10403; still being reviewed.