[COMMIT] Re-introduce ccl-encode-to-ucs-2