Backed out changeset a27eac3b7c55 (bug 1071227) DONTBUILD