Backed out changeset 24c2574041dd (bug 900954)