Backed out changeset 352a2109c6e6 (bug 987387) for m-oth orange