Merge pull request #2337 from KhronosGroup/revert-ANGLE

Revert "Merge pull request #2330 from ShabbyX/optimize_for_angle"