Backed out changeset c2e654ecbd50 (bug 1057042) for dt test failures