diff --git a/src/Fl_System_Driver.H b/src/Fl_System_Driver.H
index e1bb6b7d3..3f4b48296 100644
--- a/src/Fl_System_Driver.H
+++ b/src/Fl_System_Driver.H
@@ -149,8 +149,6 @@ public:
   virtual const char *filename_name(const char *buf) {return buf;}
   // implement to support fl_open_uri()
   virtual int open_uri(const char * /*uri*/, char * /*msg*/, int /*msglen*/) {return 0;}
-  // the default implementation of use_tooltip_timeout_condition() may be enough
-  virtual int use_tooltip_timeout_condition() {return 0;}
   // the default implementation of use_recent_tooltip_fix() may be enough
   virtual int use_recent_tooltip_fix() {return 0;}
   // the default implementation of need_test_shortcut_extra() may be enough
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx
index 674c57a49..21b60c8b9 100644
--- a/src/Fl_Tooltip.cxx
+++ b/src/Fl_Tooltip.cxx
@@ -166,10 +166,7 @@ static void tooltip_timeout(void*) {
       if (window) window->hide();
       Fl::remove_timeout(tooltip_hide_timeout);
     } else {
-      int condition = 1;
-// bugfix: no need to refactor
-      if (Fl::system_driver()->use_tooltip_timeout_condition()) condition = (Fl::grab() == NULL);
-      if ( condition ) {
+      if ( Fl::grab() == NULL ) {
         if (!window) window = new Fl_TooltipBox;
         // this cast bypasses the normal Fl_Window label() code:
         ((Fl_Widget *) window)->label(tip);
diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.H b/src/drivers/Unix/Fl_Unix_System_Driver.H
index 1859d6583..ccd92ad79 100644
--- a/src/drivers/Unix/Fl_Unix_System_Driver.H
+++ b/src/drivers/Unix/Fl_Unix_System_Driver.H
@@ -30,7 +30,6 @@ public:
                             int (*sort)(struct dirent **, struct dirent **),
                             char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE;
   int open_uri(const char *uri, char *msg, int msglen) FL_OVERRIDE;
-  int use_tooltip_timeout_condition() FL_OVERRIDE {return 1;}
   int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) FL_OVERRIDE;
   void newUUID(char *uuidBuffer) FL_OVERRIDE;
   char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor,