Backed out changeset a84fe0cefd77 (bug 1060529)
Backed out changeset 41536afea9b3 (bug 1060529) for frequent bc-1 test failures