Backed out changeset 2887e3a300ed (bug 862558) for m-bc bustage