diff --git a/test/tools/gold/remarks.ll b/test/tools/gold/remarks.ll
deleted file mode 100644
index 458f9779e5a..00000000000
--- a/test/tools/gold/remarks.ll
+++ /dev/null
@@ -1,17 +0,0 @@
-; RUN: llvm-as %s -o %t.o
-
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
-; RUN:    -plugin-opt=-pass-remarks=inline %t.o -o %t2.o 2>&1 | FileCheck %s
-
-; CHECK: f inlined into _start
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-define i32 @f() {
-  ret i32 0
-}
-
-define i32 @_start() {
-  %call = call i32 @f()
-  ret i32 %call
-}
diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp
index 9fcc83bdca2..2aec4e21bc4 100644
--- a/tools/gold/gold-plugin.cpp
+++ b/tools/gold/gold-plugin.cpp
@@ -296,9 +296,12 @@ static void diagnosticHandler(const DiagnosticInfo &DI, void *Context) {
     Level = LDPL_WARNING;
     break;
   case DS_Note:
-  case DS_Remark:
     Level = LDPL_INFO;
     break;
+    // FIXME: Just ignore remarks for now. They are always passed by
+    // if there is a custom diagnostic handler, so we get flooded.
+  case DS_Remark:
+    return;
   }
   message(Level, "LLVM gold plugin: %s",  ErrStorage.c_str());
 }
@@ -809,7 +812,7 @@ static ld_plugin_status allSymbolsReadHook(raw_fd_ostream *ApiFile) {
     return LDPS_OK;
 
   LLVMContext Context;
-  Context.setDiagnosticHandler(diagnosticHandler, nullptr, false);
+  Context.setDiagnosticHandler(diagnosticHandler);
 
   std::unique_ptr<Module> Combined(new Module("ld-temp.o", Context));
   Linker L(Combined.get());