Index: /Users/mh/Documents/workspace/SC7.0/lib/MP3/Info.pm
===================================================================
--- /Users/mh/Documents/workspace/SC7.0/lib/MP3/Info.pm	(revision 16955)
+++ /Users/mh/Documents/workspace/SC7.0/lib/MP3/Info.pm	(working copy)
@@ -36,7 +36,7 @@
 );
 
 # $Id$
-($REVISION) = ' $Revision: 1.19 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($REVISION) = ' $Revision:16460 $ ' =~ /\$Revision:\s+([^\s]+)/;
 $VERSION = '1.22';
 
 # JRF: Whether we're debugging the ID3v2.4 support
@@ -868,27 +868,7 @@
 						# Only guess if it's not ascii.
 						if ($data && $data !~ /^[\x00-\x7F]+$/) {
 
-							if ($unicode_detect_module) {
-
-								my $charset = Encode::Detect::Detector::detect($data) || 'iso-8859-1';
-								my $enc     = Encode::find_encoding($charset);
-
-								if ($enc) {
-									$data = $enc->decode($data, 0);
-								}
-
-							} else {
-
-								# Try and guess the encoding, otherwise just use latin1
-								my $dec = Encode::Guess->guess($data);
-
-								if (ref $dec) {
-									$data = $dec->decode($data);
-								} else {
-									# Best try
 									$data = Encode::decode('iso-8859-1', $data);
-								}
-							}
 						}
 					}