Backed out changeset 0685c59d2e94 (bug 1034129) for dt test failures