Reinstating fix for bug 974507