--- a/image/src/SVGDocumentWrapper.cpp
+++ b/image/src/SVGDocumentWrapper.cpp
@@ -63,34 +63,26 @@
 #include "nsSVGLength2.h"
 #include "nsSVGEffects.h"
 
 using namespace mozilla::dom;
 
 namespace mozilla {
 namespace imagelib {
 
-nsIAtom* SVGDocumentWrapper::kSVGAtom = nsnull; // lazily initialized
-
 NS_IMPL_ISUPPORTS4(SVGDocumentWrapper,
                    nsIStreamListener,
                    nsIRequestObserver,
                    nsIObserver,
                    nsISupportsWeakReference)
 
 SVGDocumentWrapper::SVGDocumentWrapper()
   : mIgnoreInvalidation(false),
     mRegisteredForXPCOMShutdown(false)
 {
-  // Lazy-initialize our "svg" atom.  (It'd be nicer to just use nsGkAtoms::svg
-  // directly, but we can't access it from here in non-libxul builds.)
-  if (!SVGDocumentWrapper::kSVGAtom) {
-    SVGDocumentWrapper::kSVGAtom =
-      NS_NewPermanentAtom(NS_LITERAL_STRING("svg"));
-  }
 }
 
 SVGDocumentWrapper::~SVGDocumentWrapper()
 {
   DestroyViewer();
   if (mRegisteredForXPCOMShutdown) {
     UnregisterForXPCOMShutdown();
   }
@@ -462,17 +454,17 @@ SVGDocumentWrapper::GetRootSVGElem()
 
   nsIDocument* doc = mViewer->GetDocument();
   if (!doc)
     return nsnull; // Can happen during destruction
 
   Element* rootElem = mViewer->GetDocument()->GetRootElement();
   if (!rootElem ||
       rootElem->GetNameSpaceID() != kNameSpaceID_SVG ||
-      rootElem->Tag() != SVGDocumentWrapper::kSVGAtom) {
+      rootElem->Tag() != nsGkAtoms::svg) {
     return nsnull;
   }
 
   return static_cast<nsSVGSVGElement*>(rootElem);
 }
 
 } // namespace imagelib
 } // namespace mozilla

--- a/image/src/SVGDocumentWrapper.h
+++ b/image/src/SVGDocumentWrapper.h
@@ -178,18 +178,14 @@ private:
 
   void     FlushLayout();
 
   nsCOMPtr<nsIContentViewer>  mViewer;
   nsCOMPtr<nsILoadGroup>      mLoadGroup;
   nsCOMPtr<nsIStreamListener> mListener;
   bool                        mIgnoreInvalidation;
   bool                        mRegisteredForXPCOMShutdown;
-
-  // Lazily-initialized pointer to nsGkAtoms::svg, to make life easier in
-  // non-libxul builds, which don't let us reference nsGkAtoms from imagelib.
-  static nsIAtom* kSVGAtom;
 };
 
 } // namespace imagelib
 } // namespace mozilla
 
 #endif // mozilla_imagelib_SVGDocumentWrapper_h_