diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index 1c43f0b..6febe63 100644
*** a/src/backend/commands/collationcmds.c
--- b/src/backend/commands/collationcmds.c
*************** get_icu_language_tag(const char *localen
*** 431,437 ****
  
  /*
   * Get a comment (specifically, the display name) for an ICU locale.
!  * The result is a palloc'd string.
   */
  static char *
  get_icu_locale_comment(const char *localename)
--- 431,439 ----
  
  /*
   * Get a comment (specifically, the display name) for an ICU locale.
!  * The result is a palloc'd string, or NULL if we can't get a comment
!  * or find that it's not all ASCII.  (We can *not* accept non-ASCII
!  * comments, because the contents of template0 must be encoding-agnostic.)
   */
  static char *
  get_icu_locale_comment(const char *localename)
*************** get_icu_locale_comment(const char *local
*** 439,444 ****
--- 441,447 ----
  	UErrorCode	status;
  	UChar		displayname[128];
  	int32		len_uchar;
+ 	int32		i;
  	char	   *result;
  
  	status = U_ZERO_ERROR;
*************** get_icu_locale_comment(const char *local
*** 446,456 ****
  									displayname, lengthof(displayname),
  									&status);
  	if (U_FAILURE(status))
! 		ereport(ERROR,
! 				(errmsg("could not get display name for locale \"%s\": %s",
! 						localename, u_errorName(status))));
  
! 	icu_from_uchar(&result, displayname, len_uchar);
  
  	return result;
  }
--- 449,468 ----
  									displayname, lengthof(displayname),
  									&status);
  	if (U_FAILURE(status))
! 		return NULL;			/* no good reason to raise an error */
  
! 	/* Check for non-ASCII comment */
! 	for (i = 0; i < len_uchar; i++)
! 	{
! 		if (displayname[i] > 127)
! 			return NULL;
! 	}
! 
! 	/* OK, transcribe */
! 	result = palloc(len_uchar + 1);
! 	for (i = 0; i < len_uchar; i++)
! 		result[i] = displayname[i];
! 	result[len_uchar] = '\0';
  
  	return result;
  }
*************** pg_import_system_collations(PG_FUNCTION_
*** 642,655 ****
  
  	/* Load collations known to ICU */
  #ifdef USE_ICU
- 	if (!is_encoding_supported_by_icu(GetDatabaseEncoding()))
- 	{
- 		ereport(NOTICE,
- 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- 				 errmsg("encoding \"%s\" not supported by ICU",
- 						pg_encoding_to_char(GetDatabaseEncoding()))));
- 	}
- 	else
  	{
  		int			i;
  
--- 654,659 ----
*************** pg_import_system_collations(PG_FUNCTION_
*** 661,666 ****
--- 665,671 ----
  		{
  			const char *name;
  			char	   *langtag;
+ 			char	   *icucomment;
  			const char *collcollate;
  			UEnumeration *en;
  			UErrorCode	status;
*************** pg_import_system_collations(PG_FUNCTION_
*** 686,693 ****
  
  				CommandCounterIncrement();
  
! 				CreateComments(collid, CollationRelationId, 0,
! 							   get_icu_locale_comment(name));
  			}
  
  			/*
--- 691,700 ----
  
  				CommandCounterIncrement();
  
! 				icucomment = get_icu_locale_comment(name);
! 				if (icucomment)
! 					CreateComments(collid, CollationRelationId, 0,
! 								   icucomment);
  			}
  
  			/*
*************** pg_import_system_collations(PG_FUNCTION_
*** 720,727 ****
  
  					CommandCounterIncrement();
  
! 					CreateComments(collid, CollationRelationId, 0,
! 								   get_icu_locale_comment(localeid));
  				}
  			}
  			if (U_FAILURE(status))
--- 727,736 ----
  
  					CommandCounterIncrement();
  
! 					icucomment = get_icu_locale_comment(name);
! 					if (icucomment)
! 						CreateComments(collid, CollationRelationId, 0,
! 									   icucomment);
  				}
  			}
  			if (U_FAILURE(status))