Backed out changeset e697e7dcc321 (bug 932322)
Backed out changeset a6878c4ee086 (bug 932309) for assertions