Please retest with 496928a4, as this commit reverts this change for desktop GL. (The behavior is retained for GLES3.)