CLOSED TREE Backed out changeset 17fe7328e60a (bug 1280477) Backed out changeset d52564553d5e (bug 1280477)