Filed and patched bug 1044004