Backed out changeset d13eec921dd2 (bug 1071227) DONTBUILD