bug 860672 landed. more work on bug 843004