Tentatively commit fix for ATI and Intel graphics