Backed out changeset 0661a1b7ec14 (bug 1109644) for M-3 Test failures