diff --git a/upload/config.php b/upload/config.php
index 84efd6f3d..f27513553 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,7 +56,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R420';
+$bb_cfg['tp_release_state'] = 'R421';
 $bb_cfg['tp_release_date'] = '23-05-2012';
 
 // Database
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index ebe53814c..42156ee26 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2517,7 +2517,6 @@ function caching_output ($enabled, $mode, $cache_var_name, $ttl = 300)
  */
 function bb_json_encode ($data)
 {
-	$data = mb_check_encoding($data, 'UTF-8') ? $data : utf8_encode($data);
 	return json_encode($data);
 }