diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 2a04b31ea..a571917f7 100644
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -1047,7 +1047,6 @@ extern void VG_(copy_m_state_static_to_baseBlock) ( void );
    Prints a msg and aborts. */
 extern void VG_(unimplemented) ( Char* msg )
             __attribute__((__noreturn__));
-extern void VG_(nvidia_moan) ( void );
 
 /* The stack on which Valgrind runs.  We can't use the same stack as the
    simulatee -- that's an important design decision.  */
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 80725ed2a..661f19d49 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1516,15 +1516,6 @@ void VG_(unimplemented) ( Char* msg )
 }
 
 
-void VG_(nvidia_moan) ( void) 
-{
-   VG_(message)(Vg_UserMsg,
-      "The following failure _might_ be caused by linking to NVidia's\n   "
-      "libGL.so, so avoiding it, if you can, _might_ help you.  For example,\n   "
-      "re-build any Qt libraries you are using without OpenGL support.");
-}
-
-
 /* ---------------------------------------------------------------------
    Sanity check machinery (permanently engaged).
    ------------------------------------------------------------------ */
diff --git a/coregrind/vg_to_ucode.c b/coregrind/vg_to_ucode.c
index 3540bf07a..8b14ff49c 100644
--- a/coregrind/vg_to_ucode.c
+++ b/coregrind/vg_to_ucode.c
@@ -4465,8 +4465,6 @@ static Addr disInstr ( UCodeBlock* cb, Addr eip, Bool* isEnd )
    default:
       VG_(printf)("disInstr: unhandled opcode 0x%x then 0x%x\n", 
                   (UInt)opc, (UInt)getUChar(eip));
-      if (opc == 0x8C)
-         VG_(nvidia_moan)();
       VG_(panic)("unhandled x86 opcode");
    }