Back out changeset 93f4e62465fd (bug 1091675) for oranges. a=me