diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 1d78911e0..9407f1a98 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1527,12 +1527,13 @@ if ( !function_exists( 'wp_text_diff' ) ) :
  * @return string Empty string if strings are equivalent or HTML with differences.
  */
 function wp_text_diff( $left_string, $right_string, $args = null ) {
-	if ( defined( 'WP_INCLUDE_PATH_DISABLED' ) )
-		return '';
-
 	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
+	// PEAR Text_Diff is lame; it includes things from include_path rather than it's own path.
+	// Not sure of the ramifications of disttributing modified code.
+	ini_set('include_path', '.' . PATH_SEPARATOR . ABSPATH . WPINC );
+
 	if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
 		require( ABSPATH . WPINC . '/wp-diff.php' );
 
@@ -1551,6 +1552,8 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
 	$renderer  = new WP_Text_Diff_Renderer_Table();
 	$diff = $renderer->render($text_diff);
 
+	ini_restore('include_path');
+
 	if ( !$diff )
 		return '';
 
diff --git a/wp-settings.php b/wp-settings.php
index 474632a0d..0dfdf0955 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -196,28 +196,6 @@ if ( constant('WP_POST_REVISIONS') ) {
 		define('WP_INCLUDE_PATH_DISABLED', true);
 }
 
-if ( !defined('WP_LANG_DIR') ) {
-	/**
-	 * Stores the location of the language directory. First looks for language folder in WP_CONTENT_DIR
-	 * and uses that folder if it exists. Or it uses the "languages" folder in WPINC.
-	 *
-	 * @since 2.1.0
-	 */
-	if ( file_exists(WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '/languages') ) {
-		define('WP_LANG_DIR', WP_CONTENT_DIR . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
-		if (!defined('LANGDIR')) {
-			// Old static relative path maintained for limited backwards compatibility - won't work in some cases
-			define('LANGDIR', 'wp-content/languages');
-		}
-	} else {
-		define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
-		if (!defined('LANGDIR')) {
-			// Old relative path maintained for backwards compatibility
-			define('LANGDIR', WPINC . '/languages');
-		}
-	}
-}
-
 require (ABSPATH . WPINC . '/compat.php');
 require (ABSPATH . WPINC . '/functions.php');
 require (ABSPATH . WPINC . '/classes.php');