revert the DRI2 commits
46 files changed