Backed out changeset 34594cb8b2e4 (bug 1057512)
Backed out changeset 188d22215166 (bug 1057512) for causing dt2 memory leaks