Backed out changeset 233c0150fc51 (bug 1043728) DONTBUILD