--- a/ChangeSet.st	Fri Dec 11 17:47:45 2009 +0100
+++ b/ChangeSet.st	Fri Dec 11 17:49:56 2009 +0100
@@ -287,7 +287,7 @@
         mime = 'application/x-smalltalk-dolphin-package' ifTrue:[
             ^ self fromDolphinPACStream:stream.
         ].            
-        stream := self decodedStreamFor:stream.
+        stream := EncodedStream decodedStreamFor:stream.
         ^ self fromStream:stream.
     ] ensure:[
         stream notNil ifTrue:[stream close].
@@ -572,23 +572,8 @@
 !ChangeSet class methodsFor:'utilities'!
 
 decodedStreamFor:aStream
-    |encoding decoder decodedStream|
-
-    "/ setup for no-encoding; allows for a later switch to a real encoder,
-    "/ whenever an encoding pragma is encountered later.
-    decoder := CharacterEncoder nullEncoderInstance.
-
-    aStream isPositionable ifTrue:[
-        encoding := CharacterEncoder guessEncodingOfStream:aStream.
-        (encoding notNil
-        and:[ encoding ~= #'iso8859-1' 
-        and:[ encoding ~= #'ascii' ]]) ifTrue:[
-            decoder := CharacterEncoder encoderFor:encoding.
-        ].
-    ].
-    decodedStream := EncodedStream stream:aStream encoder:decoder.
-    decodedStream skipEncodingChunk.
-    ^ decodedStream
+    <resource: #obsolete>
+    ^ EncodedStream decodedStreamFor:aStream
 ! !
 
 !ChangeSet methodsFor:'Compatibility-ST80'!
@@ -2541,9 +2526,9 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.169 2009-12-11 16:47:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.170 2009-12-11 16:49:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.169 2009-12-11 16:47:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.170 2009-12-11 16:49:56 cg Exp $'
 ! !