Remove ambiguous types to work around bulk upload issue 29