Revert "GRAPI DG enhancement"