Backed out changeset 9da8bc670c03 (bug 957241) for frequent intermittent m-bc orange