Minimal texture change, derived from #1773, close #1207.