Backed out changeset 650ea68d7ef2 (bug 1022212) for causing bug 1022235.