Revert "Massive GL3.3 changes - Ready for testing"
Merge pull request #799 from enigma-dev/revert-789-GL3.3Fixes

Revert "Massive GL3.3 changes - Ready for testing"