042a333028
This reverts commitb9abc6139aand the follow on fixes (7aae704and6fe1b47). It's changing the glapi/driver ABI and causes a number of problems for debug/non-debug builds.