From Khronos internal issue 254. This reverses #1091 which was implemented with #1229
From Khronos internal issue 254.
This reverses #1091 which was implemented with #1229