Backed out changeset aa81a7c812f0 (bug 1071227) DONTBUILD