Backed out changeset 71118c075821 (bug 947550) r=margaret on a CLOSED TREE