diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index dd24882fe..08bbdb7fd 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -114,7 +114,7 @@ if (false !== $possibly_uploaded_val) {
         $val = preg_replace('/[^01]/', '0', $val);
         $val = "b'" . PMA_sqlAddslashes($val) . "'";
     } elseif (! (($type == 'datetime' || $type == 'timestamp') && $val == 'CURRENT_TIMESTAMP')) {
-        $val = "'" . PMA_sqlAddslashes($val) . "' /*" . $type . " */";
+        $val = "'" . PMA_sqlAddslashes($val) . "'";
     }
 
     // Was the Null checkbox checked for this field?
diff --git a/tbl_change.php b/tbl_change.php
index 5c0088586..62fbbf159 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -457,7 +457,7 @@ foreach ($rows as $row_id => $vrow) {
                 $special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']);
             } else {
                 // special binary "characters"
-                if ($field['is_binary'] || $field['is_blob']) {
+                if ($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) {
                 	if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
                 		$vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
                 		$field['display_binary_as_hex'] = true;