Revert "Slight cleanup in texture upload format selection."