bug 760876 landed. updates for bug 860672