Backed out changeset 371cd4b623de (bug 901207) for m-bc orange