Backout bug 907585, break B2G Mnw test cases