Reverted commit 4255ec2 due to OpenGL errors

This will have to be revised when OpenGL 3.3 is taken into use.