Backed out changeset e6eb44114372 (bug 1071227) DONTBUILD