Backed out changeset 895eeb7bddb8 (bug 973294) for bc1 test failures
Backed out changeset 5e0288a4e398 (bug 977774) for bc1 test failures