Backed out changeset 4772aa3dbb3e
Backed out changeset 15b65979a332 (bug 1071227) DONTBUILD