Backed out changeset ed42b5ee3c94 (bug 1096248) for bc-1 test failures