Roll back stlport change until it can be done across the whole codebase #155

Merged
merged 1 commit into from May 4, 2015