Backed out changeset a0214893763c (bug 874363) pushed mistakenly, DONTBUILD