diff --git a/src/BroString.cc b/src/BroString.cc
index 19f7a16566..5ccc08c4c1 100644
--- a/src/BroString.cc
+++ b/src/BroString.cc
@@ -194,22 +194,22 @@ char* BroString::Render(int format, int* len) const
 
 	for ( int i = 0; i < n; ++i )
 		{
-		if ( b[i] == '\0' && (format & ESC_NULL) )
-			{
-			*sp++ = '\\'; *sp++ = '0';
-			}
+		//if ( b[i] == '\0' && (format & ESC_NULL) )
+		//	{
+		//	*sp++ = '\\'; *sp++ = 'x'; *sp++ = '0'; *sp++ = '0';
+		//	}
+//
+		//else if ( b[i] == '\x7f' && (format & ESC_DEL) )
+		//	{
+		//	*sp++ = '^'; *sp++ = '?';
+		//	}
+//
+		//else if ( b[i] <= 26 && (format & ESC_LOW) )
+		//	{
+		//	*sp++ = '^'; *sp++ = b[i] + 'A' - 1;
+		//	}
 
-		else if ( b[i] == '\x7f' && (format & ESC_DEL) )
-			{
-			*sp++ = '^'; *sp++ = '?';
-			}
-
-		else if ( b[i] <= 26 && (format & ESC_LOW) )
-			{
-			*sp++ = '^'; *sp++ = b[i] + 'A' - 1;
-			}
-
-		else if ( b[i] == '\\' && (format & ESC_ESC) )
+		if ( b[i] == '\\' && (format & ESC_ESC) )
 			{
 			*sp++ = '\\'; *sp++ = '\\';
 			}
diff --git a/src/BroString.h b/src/BroString.h
index d04e9768f2..aa3e1a0f96 100644
--- a/src/BroString.h
+++ b/src/BroString.h
@@ -76,9 +76,9 @@ public:
 	enum render_style {
 		ESC_NONE = 0,
 
-		ESC_NULL = (1 << 0),	// 0 -> "\0"
-		ESC_DEL  = (1 << 1),	// DEL -> "^?"
-		ESC_LOW  = (1 << 2),	// values <= 26 mapped into "^[A-Z]"
+		//ESC_NULL = (1 << 0),	// 0 -> "\0"
+		//ESC_DEL  = (1 << 1),	// DEL -> "^?"
+		//ESC_LOW  = (1 << 2),	// values <= 26 mapped into "^[A-Z]"
 		ESC_ESC  = (1 << 3),	// '\' -> "\\"
 		ESC_QUOT = (1 << 4),	// '"' -> "\"", ''' -> "\'"
 		ESC_HEX  = (1 << 5),	// Not in [32, 126]? -> "%XX"
@@ -89,7 +89,7 @@ public:
 	};
 
 	static const int EXPANDED_STRING =	// the original style
-		ESC_NULL | ESC_DEL | ESC_LOW | ESC_HEX;
+		ESC_ESC | ESC_HEX;
 
 	static const int BRO_STRING_LITERAL =	// as in a Bro string literal
 		ESC_ESC | ESC_QUOT | ESC_HEX;
diff --git a/src/Desc.cc b/src/Desc.cc
index f636a028b5..e180bf1a30 100644
--- a/src/Desc.cc
+++ b/src/Desc.cc
@@ -182,10 +182,10 @@ void ODesc::AddBytes(const BroString* s)
 		else
 			{
 			int render_style = BroString::EXPANDED_STRING;
-			if ( Style() == ALTERNATIVE_STYLE )
-				// Only change NULs, since we can't in any case
-				// cope with them.
-				render_style = BroString::ESC_NULL;
+			//if ( Style() == ALTERNATIVE_STYLE )
+			//	// Only change NULs, since we can't in any case
+			//	// cope with them.
+			//	render_style = BroString::ESC_NULL;
 
 			const char* str = s->Render(render_style);
 			Add(str);