landed the patches for bug 843004