Add missing fix from bug 968576