Backed out changeset 556dc4f97e08 (bug 1072090) for m-oth orange