Backed out changeset 69c5cfd6e270 (bug 1081343) for bc1 test failures