Backed out changeset 25e5b5838db2 (bug 1061805) for Mnw bustage.