Backed out changeset 04bfd88f4fb8 (bug 1008126)
Backed out changeset 63eb4a7d5a3c (bug 1008126) for possible causing m1 and m8 test failures on a CLOSED TREE