Revert "Reapply 'Added universe option to surpress identity conversion.'"