Backed out changeset ccde75e4b1af (bug 1004152) for Mnw bustage. DONTBUILD