diff --git a/ChangeLog b/ChangeLog
index a7b6f6182..8460515cb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $Source$
 
 2005-11-10 Michal Čihař  <michal@cihar.com>
     * scripts/create-release.sh: = is correct for comparsion in shell.
+    * server_privileges.php: Revert fix for #1353437, there are wrong data and
+      not displaying of it, fix bad display of table privileges.
 
 2005-11-09 Marc Delisle  <lem9@users.sourceforge.net>
     * pdf_pages.php: bug #1245891, too large scaling in PDF schema
diff --git a/server_privileges.php b/server_privileges.php
index 88e82bc57..76b9ae716 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1665,7 +1665,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
                     .' AND ' . PMA_convert_using('`Db`')
                     .' LIKE ' . PMA_convert_using($dbname, 'quoted')
                     .' ORDER BY `Table_name` ASC;';
-                $db_rights = PMA_DBI_fetch_result( $sql_query, 'Db', NULL, NULL, PMA_DBI_QUERY_STORE );
+                $db_rights = PMA_DBI_fetch_result($sql_query);
             }
 
 
@@ -1688,7 +1688,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
                        . '        </tt></td>' . "\n"
                        . '    <td>' . (((empty($dbname) && $row['Grant_priv'] == 'Y') || (!empty($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? $GLOBALS['strYes'] : $GLOBALS['strNo']) . '</td>' . "\n"
                        . '    <td>';
-                    if ((isset($row['Table_priv']) && $row['Table_priv']) || (isset($row['Column_priv']) && $row['Column_priv'])) {
+                    if ($row['Table_priv'] || $row['Column_priv']) {
                         echo $GLOBALS['strYes'];
                     } else {
                         echo $GLOBALS['strNo'];
@@ -1701,7 +1701,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
                         urlencode( empty($dbname) ? '' : $row['Table_name'] ) );
                     echo '</td>' . "\n"
                        . '    <td>';
-                    if ( (isset($row['can_delete']) && $row['can_delete']) || (isset($row['Table_name']) && $row['Table_name'])) {
+                    if ($row['can_delete'] || $row['Table_name']) {
                         printf( $link_revoke, urlencode( $username ),
                             urlencode( $hostname ),
                             urlencode( empty( $dbname ) ? $row['Db'] : $dbname ),