Backed out changeset 4476fca7e5fe (bug 1052009) for bc2 test failures
Backed out changeset 71198624da7b (bug 1045046) for bc2 test failures