diff --git a/alpine/packages/diagnostics/etc/init.d/diagnostics b/alpine/packages/diagnostics/etc/init.d/diagnostics
index 4e0ceb45b..eee304a61 100755
--- a/alpine/packages/diagnostics/etc/init.d/diagnostics
+++ b/alpine/packages/diagnostics/etc/init.d/diagnostics
@@ -19,12 +19,10 @@ start()
 			DIAGNOSTICS_SERVER_FLAGS="-http"
 		;;
 		"windows")
-			# TODO(Rolf/David): Are these correct?
-			DIAGNOSTICS_SERVER_FLAGS="-hvsock -rawtcp"
+			DIAGNOSTICS_SERVER_FLAGS="-hvsock"
 		;;
 		"mac")
-			# TODO(Justin/Anil): Are these correct?
-			DIAGNOSTICS_SERVER_FLAGS="-vsock -rawtcp"
+			DIAGNOSTICS_SERVER_FLAGS="-vsock"
 		;;
 	esac