diff --git a/src/util/messages.ml b/src/util/messages.ml
index 9cc08b6faf..42a3118978 100644
--- a/src/util/messages.ml
+++ b/src/util/messages.ml
@@ -294,7 +294,7 @@ let msg_noloc severity ?(tags=[]) ?(category=Category.Unknown) fmt =
   if !AnalysisState.should_warn && Severity.should_warn severity && (Category.should_warn category || Tags.should_warn tags) then (
     let finish doc =
       let text = GobPretty.show doc in
-      add {tags = Category category :: tags; severity; multipiece = Single {loc = None; text; context = msg_context ()}} (* TODO: why context? *)
+      add {tags = Category category :: tags; severity; multipiece = Single {loc = None; text; context = None}}
     in
     Pretty.gprintf finish fmt
   )
@@ -332,7 +332,7 @@ let msg_final severity ?(tags=[]) ?(category=Category.Unknown) fmt =
   if !AnalysisState.should_warn then (
     let finish doc =
       let text = GobPretty.show doc in
-      add_final {tags = Category category :: tags; severity; multipiece = Single {loc = None; text; context = msg_context ()}} (* TODO: why context? *)
+      add_final {tags = Category category :: tags; severity; multipiece = Single {loc = None; text; context = None}}
     in
     Pretty.gprintf finish fmt
   )