Backed out bug 1032978,r=Sylvestre