Complete the fix for bug 6100