Backed out changeset fb4b70803019 (bug 1065265) for bc1 test failures