diff --git a/accessible/atk/AccessibleWrap.cpp b/accessible/atk/AccessibleWrap.cpp
index a6e0b70b56a..3c837bfefe3 100644
--- a/accessible/atk/AccessibleWrap.cpp
+++ b/accessible/atk/AccessibleWrap.cpp
@@ -250,14 +250,22 @@ AccessibleWrap::~AccessibleWrap()
 void
 AccessibleWrap::ShutdownAtkObject()
 {
-    if (mAtkObject) {
-        if (IS_MAI_OBJECT(mAtkObject)) {
-            MAI_ATK_OBJECT(mAtkObject)->accWrap = 0;
-        }
-        SetMaiHyperlink(nullptr);
-        g_object_unref(mAtkObject);
-        mAtkObject = nullptr;
+  if (!mAtkObject)
+    return;
+
+  if (IS_MAI_OBJECT(mAtkObject)) {
+    MAI_ATK_OBJECT(mAtkObject)->accWrap = 0;
+    MaiHyperlink* maiHyperlink
+      = (MaiHyperlink*)g_object_get_qdata(G_OBJECT(mAtkObject),
+                                          quark_mai_hyperlink);
+    if (maiHyperlink) {
+      delete maiHyperlink;
+      g_object_set_qdata(G_OBJECT(mAtkObject), quark_mai_hyperlink, nullptr);
     }
+  }
+
+  g_object_unref(mAtkObject);
+  mAtkObject = nullptr;
 }
 
 void
@@ -281,28 +289,13 @@ AccessibleWrap::GetMaiHyperlink(bool aCreate /* = true */)
                                                          quark_mai_hyperlink);
         if (!maiHyperlink && aCreate) {
             maiHyperlink = new MaiHyperlink(this);
-            SetMaiHyperlink(maiHyperlink);
+            g_object_set_qdata(G_OBJECT(mAtkObject), quark_mai_hyperlink,
+                               maiHyperlink);
         }
     }
     return maiHyperlink;
 }
 
-void
-AccessibleWrap::SetMaiHyperlink(MaiHyperlink* aMaiHyperlink)
-{
-    NS_ASSERTION(quark_mai_hyperlink, "quark_mai_hyperlink not initialized");
-    NS_ASSERTION(IS_MAI_OBJECT(mAtkObject), "Invalid AtkObject");
-    if (quark_mai_hyperlink && IS_MAI_OBJECT(mAtkObject)) {
-        MaiHyperlink* maiHyperlink = GetMaiHyperlink(false);
-        if (!maiHyperlink && !aMaiHyperlink) {
-            return; // Never set and we're shutting down
-        }
-        delete maiHyperlink;
-        g_object_set_qdata(G_OBJECT(mAtkObject), quark_mai_hyperlink,
-                           aMaiHyperlink);
-    }
-}
-
 void
 AccessibleWrap::GetNativeInterface(void** aOutAccessible)
 {
diff --git a/accessible/atk/AccessibleWrap.h b/accessible/atk/AccessibleWrap.h
index 62a4ba68b55..7966f8bf1b5 100644
--- a/accessible/atk/AccessibleWrap.h
+++ b/accessible/atk/AccessibleWrap.h
@@ -63,9 +63,8 @@ public:
 
   bool IsValidObject();
 
-  // get/set the MaiHyperlink object for this AccessibleWrap
+  // get the MaiHyperlink object for this AccessibleWrap
   MaiHyperlink* GetMaiHyperlink(bool aCreate = true);
-  void SetMaiHyperlink(MaiHyperlink* aMaiHyperlink);
 
   static const char * ReturnString(nsAString &aString) {
     static nsCString returnedString;