=== Slim/DataStores/DBI/DBIStore.pm
==================================================================
--- Slim/DataStores/DBI/DBIStore.pm	(revision 12338)
+++ Slim/DataStores/DBI/DBIStore.pm	(local)
@@ -37,9 +37,6 @@
 # Save the persistant DB cache on an interval
 my $DB_SAVE_INTERVAL = 30;
 
-# cached value of commonAlbumTitles pref
-our $common_albums;
-
 # hold the current cleanup state
 our $cleanupIds;
 our $cleanupStage;
@@ -100,10 +97,6 @@
 	
 	$self->_commitDBTimer();
 
-	$common_albums = Slim::Utils::Prefs::get('commonAlbumTitles');
-
-	Slim::Utils::Prefs::addPrefChangeHandler('commonAlbumTitles', \&commonAlbumTitlesChanged);
-
 	return $self;
 }
 
@@ -1735,15 +1728,8 @@
 
 			} else {
 
-				# Check if the album name is one of the "common album names"
-				# we've identified in prefs. If so, we require a match on
-				# both album name and primary artist name.
-				my $commonAlbumTitlesToggle = Slim::Utils::Prefs::get('commonAlbumTitlesToggle');
-
-				if ($commonAlbumTitlesToggle && (grep $album =~ m/^$_$/i, @$common_albums)) {
-
-					$search->{'contributor'} = $contributor;
-				}
+				# Try to match based on the primary contributor
+				$search->{'contributor'} = $contributor;
 			}
 
 			($albumObj) = eval { Slim::DataStores::DBI::Album->search($search) };
@@ -2013,22 +1999,6 @@
  	}
 }
 
-# This is a callback that is run when the user changes the common album titles
-# preference in settings.
-sub commonAlbumTitlesChanged {
-	my ($value, $key, $index) = @_;
-
-	# Add the new value, or splice it out.
-	if ($value) {
-
-		$common_albums->[$index] = $value;
-
-	} else {
-
-		splice @$common_albums, $index, 1;
-	}
-}
-
 1;
 
 __END__
=== Slim/Utils/Prefs.pm
==================================================================
--- Slim/Utils/Prefs.pm	(revision 12338)
+++ Slim/Utils/Prefs.pm	(local)
@@ -162,8 +162,6 @@
 		'dbsource'		=> 'dbi:SQLite:dbname=%s',
 		'dbusername'		=> '',
 		'dbpassword'		=> '',
-		'commonAlbumTitles'	=> ['Greatest Hits', 'Best of...', 'Live'],
-		'commonAlbumTitlesToggle' => 0,
 		'noGenreFilter'		=> 0,
 		'variousArtistAutoIdentification' => 0,
 		'useBandAsAlbumArtist'  => 0,
=== Slim/Web/Setup.pm
==================================================================
--- Slim/Web/Setup.pm	(revision 12338)
+++ Slim/Web/Setup.pm	(local)
@@ -1615,7 +1615,7 @@
 	,'behavior' => {
 		'title' => string('BEHAVIOR_SETTINGS'),
 		'parent' => 'server',
-		'GroupOrder' => [qw(DisplayInArtists VariousArtists Default CommonAlbumTitles)],
+		'GroupOrder' => [qw(DisplayInArtists VariousArtists Default)],
 		'Groups' => {
 	
 			'Default' => {
@@ -1635,16 +1635,6 @@
 				'Suppress_PrefLine' => 1,
 			},
 
-			'CommonAlbumTitles' => {
-				'PrefOrder' => [qw(commonAlbumTitlesToggle commonAlbumTitles)],
-				'GroupHead' => string('SETUP_COMMONALBUMTITLES'),
-				'Suppress_PrefHead' => 1,
-				'Suppress_PrefSub' => 1,
-				'GroupSub' => 1,
-				'GroupLine' => 1,
-				'Suppress_PrefLine' => 1,
-			},
-
 			'VariousArtists' => {
 				'PrefOrder' => [qw(variousArtistAutoIdentification useBandAsAlbumArtist variousArtistsString)],
 				'GroupHead' => string('SETUP_VARIOUSARTISTS'),
@@ -1789,33 +1779,6 @@
 					'0' => string ('SETUP_GROUPDISCS_0'),
 				},
 			 },
-
-			'commonAlbumTitlesToggle' => {
-				'validate'      => \&validateAcceptAll,
-				'inputTemplate' => 'setup_input_chk.html',
-				'PrefChoose'    => string('SETUP_COMMONALBUMTITLES_TOGGLE'),
-			},
-
-			'commonAlbumTitles'	=> {
-				'isArray'          => 1,
-				'arrayAddExtra'    => 1,
-				'arrayDeleteNull'  => 1,
-				'arrayDeleteValue' => '',
-				'arrayBasicValue'  => 0,
-				'PrefSize'         => 'large',
-				'inputTemplate'    => 'setup_input_array_txt.html',
-				'onChange'         => sub {
-
-					my ($client,$changeref,$paramref,$pageref) = @_;
-
-					if (exists($changeref->{'commonAlbumTitles'}{'Processed'})) {
-						return;
-					}
-
-					processArrayChange($client,'commonAlbumTitles',$paramref,$pageref);
-					$changeref->{'commonAlbumTitles'}{'Processed'} = 1;
-				}
-			}
 		}
 	} #end of setup{'behavior'} hash
 
=== strings.txt
==================================================================
--- strings.txt	(revision 12338)
+++ strings.txt	(local)
@@ -4925,28 +4925,6 @@
 	SE	Behåll inte låtlistor
 	ZH_CN	不要记住播放表
 
-SETUP_COMMONALBUMTITLES
-	CZ	Časté tituly alb
-	DE	Geläufige Albumtitel
-	EN	Common Album Titles
-	ES	Títulos Comunes de Álbumes
-	NL	Algemene albumtitels
-	ZH_CN	共同的乐谱帖标题
-
-SETUP_COMMONALBUMTITLES_TOGGLE
-	DE	Eine Liste von geläufigen Albumtiteln definieren
-	EN	Specifiy a list of Common Album Titles
-	ES	Especificar una lista de Nombres Comunes de Álbumes
-	NL	Geef een lijst op van algemene albumtitels
-
-SETUP_COMMONALBUMTITLES_DESC
-	CZ	Standardně SlimServer seskupuje skladby ze stejného alba do jedné skupiny, přestože jsou skladby umístěné v různých adresářích. Pro velice často používané názvy alb, jako například "Greatest Hits", je ještě vyždadováno, aby se pro skladby jednoho alba shodovalo jmého interpreta. Seznam níže reprezentuje skupinu utakovýchto názvů, kde bude tato dodatečné kontrola uplatňována.
-	DE	Meist gruppiert SlimServer Lieder mit dem gleichen Albumnamen auch dann, wenn sie in unterschiedlichen Ordnern liegen. Für sehr geläufige Albentitel wie z.B. "Greatest Hits" muss zusätzlich der Interpret mit einbezogen werden. Diese Liste definiert die Albentitel, für welche SlimServer auch den Interpreten berücksichtigen soll.
-	EN	In most cases, SlimServer groups songs from the same album together even if the songs are in different folders. For very common album titles, such as "Greatest Hits", it additionally requires a match on artist name to correctly group tracks from the same album. The list below represents the album titles for which SlimServer requires an artist match for album grouping.
-	ES	En la mayoría de los casos, SlimServer agrupa las canciones del mismo álbum, incluso si las canciones estan en carpetas diferentes. Para títulos muy comunes de álbumes, como "Grandes Exitos", se requiere además que concuerde al nombre del artista, para que la agrupación sea correcta con las canciones del mismo álbum. La lista debajo representa los títulos de álbumes para los cuales SlimServer requerirá que coincida el artista para agrupar el álbum.
-	NL	In de meeste gevallen zal de SlimServer liedjes groeperen van hetzelfde album, ook als de liedjes in verschillende folders staan. Voor zeer algemene albumtitels zoals  "Greatest Hits" is een aanvullende overeenkomst nodig op de artiestnaam om de liedjes correct te groeperen. In de lijst hieronder staan albumtitels waarvoor SlimServer ook een overeenkomst op de artiestnaam nodig heeft.
-	ZH_CN	在一般情况下，SlimServer会将属于共同乐谱帖但保存在不同文件夹里的的歌曲集合在一起。对于一些较常见的乐谱帖标题，譬如＂最佳精选＂，它会进一步针对艺人名字进行匹配来提高准确性。以下为SlimServer决定对乐谱帖标题进行进一步艺人名匹配的标题名。
-
 SETUP_RESHUFFLEONREPEAT
 	CZ	Zamíchat při opakování
 	DE	Erneutes Mischen bei Wiederholung