Merge pull request #2516 from comex/hires-oops Undo accidental screwup of some HiresTextures code from project-moration
