Merge "Temporary put -DAG back to fix broken test."