Backed out changeset c39980fa9099 (bug 1004152) for Mnw bustage.