Backed out changeset c9cf7f0d8a21 (bug 1026568) for bc2 test failures