Backed out changeset 184a0076278b (bug 890195). Almost-perma orange