Reverted de-duplication cleanup for breaking variant stripping (will try again later w/ manual stripping) => fix for current shader issues