Backed out changeset 689ec26f50e1 (bug 949525) for causing assertions