diff --git a/index.php b/index.php
index 42e03df39e..2d33c3939b 100644
--- a/index.php
+++ b/index.php
@@ -198,7 +198,6 @@ if ($server > 0 || count($cfg['Servers']) > 1
                'select_collation_connection',
                $collation_connection,
                true,
-               4,
                true
            )
            . '        </form>' . "\n"
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 2662719dc9..0f9ac15f40 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -36,8 +36,7 @@ if ($is_create_db_priv) {
         'db_collation',
         null,
         null,
-        true,
-        5
+        true
     );
 
     if (! empty($dbstats)) {
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index a5b3dbdfac..f01b1b5465 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -24,8 +24,8 @@ if (! defined('PHPMYADMIN')) {
  * @return string
  */
 function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
-    $name = null, $id = null, $default = null, $label = true, $indent = 0,
-    $submitOnChange = false, $displayUnavailable = false
+    $name = null, $id = null, $default = null, $label = true,
+    $submitOnChange = false
 ) {
     global $mysql_charsets, $mysql_charsets_descriptions,
         $mysql_charsets_available, $mysql_collations, $mysql_collations_available;
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index e9097a151c..eb8132626b 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -245,8 +245,7 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table)
             'db_collation',
             'select_db_collation',
             isset($_REQUEST['db_collation']) ? $_REQUEST['db_collation'] : '',
-            false,
-            3
+            false
         )
         . '</fieldset>'
         . '<fieldset class="tblFooters">'
@@ -797,7 +796,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
         . '<td>'
         . PMA_generateCharsetDropdownBox(
             PMA_CSDROPDOWN_COLLATION,
-            'tbl_collation', null, $tbl_collation, false, 3
+            'tbl_collation', null, $tbl_collation, false
         )
         . '</td>'
         . '</tr>';
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 68e3d61a61..0d6686a462 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -100,7 +100,7 @@ function PMA_getHtmlForTableConfigurations()
                 ? $_REQUEST['tbl_collation']
                 : null
             ),
-            false, 3
+            false
         )
         . '</td>'
         . '</tr>';
diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php
index 638ca049ce..7488f54c26 100644
--- a/test/libraries/PMA_mysql_charsets_test.php
+++ b/test/libraries/PMA_mysql_charsets_test.php
@@ -284,7 +284,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
         $this->assertContains('title="German', $result);
 
         $result = PMA_generateCharsetDropdownBox(
-            2, null, "test_id", "latin1", false, 0, true, false
+            2, null, "test_id", "latin1", false, true
         );
         $this->assertContains('name="character_set"', $result);
         $this->assertNotContains('Charset</option>', $result);