Backed out changeset f552ce04bc36 (bug 809056) for m-bc orange