Revert remnants of reverted non-atlas texture changes, reduce upstream diff