Backed out changeset 71dc115fe230 (bug 929766) for other m-bc bustage on what I'm guessing is a CLOSED TREE