Revert "Integrating Richard's texture updates. Hopefully all is correct."

This reverts commit b73b2dd06692c730f79bbd4be654451ef79372c6.