Backout bug 873351, break Mnw test cases.