more rebases for bug 760876