Backed out changeset b2cfd9248bd2 (bug 1045046)
Backed out changeset c4c2474a4f75 (bug 993584) for suspecion of causing bc1 test failures