Backed out changeset 2d021370c57f (bug 965990) for causing bug 973307.