Backed out changeset e3c1fffb0145 (bug 978861) due to m-o test failures. CLOSED TREE