--- a/CharacterArray.st	Thu Nov 06 12:58:08 2008 +0100
+++ b/CharacterArray.st	Thu Nov 06 12:59:33 2008 +0100
@@ -3036,17 +3036,11 @@
     |in out is16Bit c|
 
     is16Bit := false.
-    out := WriteStream on:(String uninitializedNew:self size).
+    out := CharacterWriteStream on:(String uninitializedNew:self size).
     in := self readStream.
     [in atEnd] whileFalse:[
-	c := Character utf8DecodeFrom:in.
-	is16Bit ifFalse:[
-	    c codePoint > 16rFF ifTrue:[
-		out := WriteStream with:(UnicodeString fromString:out contents).
-		is16Bit := true.
-	    ].
-	].
-	out nextPut:c.
+        c := Character utf8DecodeFrom:in.
+        out nextPut:c.
     ].
     ^ out contents
 
@@ -3064,12 +3058,12 @@
       |utf8Encoding original readBack|
 
       1 to:16rFFFF do:[:ascii |
-	original := (Character value:ascii) asString.
-	utf8Encoding := original utf8Encoded.
-	readBack := utf8Encoding utf8Decoded.
-	readBack = original ifFalse:[
-	    self halt
-	]
+        original := (Character value:ascii) asString.
+        utf8Encoding := original utf8Encoded.
+        readBack := utf8Encoding utf8Decoded.
+        readBack = original ifFalse:[
+            self halt
+        ]
       ]
     "
 !
@@ -5515,7 +5509,7 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.383 2008-11-06 10:59:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.384 2008-11-06 11:59:33 stefan Exp $'
 ! !
 
 CharacterArray initialize!