Revert and Fix
Reverted earlier changes and still fixed texture bug, glGet is extremely
expensive.
Merge pull request #552 from RobertBColton/master

Revert and Fix