Backed out 2 changesets (bug 904298) DONTBUILD