diff --git a/Userland/Libraries/LibGfx/BitmapFont.cpp b/Userland/Libraries/LibGfx/BitmapFont.cpp
index c84636879a..6a83542113 100644
--- a/Userland/Libraries/LibGfx/BitmapFont.cpp
+++ b/Userland/Libraries/LibGfx/BitmapFont.cpp
@@ -317,11 +317,11 @@ String BitmapFont::qualified_name() const
     return String::formatted("{} {} {}", family(), presentation_size(), weight());
 }
 
-const Font& BitmapFont::bold_variant() const
+Font const& Font::bold_variant() const
 {
     if (m_bold_variant)
         return *m_bold_variant;
-    m_bold_variant = Gfx::FontDatabase::the().get(m_family, m_presentation_size, 700);
+    m_bold_variant = Gfx::FontDatabase::the().get(family(), presentation_size(), 700);
     if (!m_bold_variant)
         m_bold_variant = this;
     return *m_bold_variant;
diff --git a/Userland/Libraries/LibGfx/BitmapFont.h b/Userland/Libraries/LibGfx/BitmapFont.h
index e3d4701759..2bdbfbe8d0 100644
--- a/Userland/Libraries/LibGfx/BitmapFont.h
+++ b/Userland/Libraries/LibGfx/BitmapFont.h
@@ -105,8 +105,6 @@ public:
 
     String qualified_name() const override;
 
-    Font const& bold_variant() const override;
-
     static size_t glyph_count_by_type(FontTypes type);
     static String type_name_by_type(FontTypes type);
 
@@ -143,8 +141,6 @@ private:
 
     bool m_fixed_width { false };
     bool m_owns_arrays { false };
-
-    mutable RefPtr<Gfx::Font> m_bold_variant;
 };
 
 }
diff --git a/Userland/Libraries/LibGfx/Font.h b/Userland/Libraries/LibGfx/Font.h
index ada179eae1..d1fc576ff1 100644
--- a/Userland/Libraries/LibGfx/Font.h
+++ b/Userland/Libraries/LibGfx/Font.h
@@ -121,7 +121,10 @@ public:
 
     virtual String qualified_name() const = 0;
 
-    virtual const Font& bold_variant() const = 0;
+    Font const& bold_variant() const;
+
+private:
+    mutable RefPtr<Gfx::Font> m_bold_variant;
 };
 
 }
diff --git a/Userland/Libraries/LibTTF/Font.cpp b/Userland/Libraries/LibTTF/Font.cpp
index 49734e74aa..e9d270e7d3 100644
--- a/Userland/Libraries/LibTTF/Font.cpp
+++ b/Userland/Libraries/LibTTF/Font.cpp
@@ -10,6 +10,7 @@
 #include <AK/Utf32View.h>
 #include <AK/Utf8View.h>
 #include <LibCore/File.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibTTF/Cmap.h>
 #include <LibTTF/Font.h>
 #include <LibTTF/Glyf.h>
diff --git a/Userland/Libraries/LibTTF/Font.h b/Userland/Libraries/LibTTF/Font.h
index 42d2b948e0..b3dfd41180 100644
--- a/Userland/Libraries/LibTTF/Font.h
+++ b/Userland/Libraries/LibTTF/Font.h
@@ -144,7 +144,6 @@ public:
     virtual String family() const override { return m_font->family(); }
     virtual String variant() const override { return m_font->variant(); }
     virtual String qualified_name() const override { return String::formatted("{} {} {}", family(), presentation_size(), weight()); }
-    virtual const Font& bold_variant() const override { return *this; } // FIXME: Perhaps remove this from the Gfx::Font interface
 
 private:
     NonnullRefPtr<TTF::Font> m_font;