Backed out changeset 35496f35f0d1 (bug 1088660) for bc1 errors a=backout