Fix rebase error for bug 1012407 (r=CLOSED TREE)