diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp
index 01ce85f72a8..fd337c9e2ce 100644
--- a/mozilla/gfx/src/nsDeviceContext.cpp
+++ b/mozilla/gfx/src/nsDeviceContext.cpp
@@ -63,9 +63,14 @@ static PRBool PR_CALLBACK DeleteValue(nsHashKey* aKey, void* aValue, void* closu
 
 DeviceContextImpl :: ~DeviceContextImpl()
 {
+#if 0
+  //XXX temporarily disabled because it causes device context contexts
+  //XXX to hang around until shutdown
+
   nsCOMPtr<nsIObserverService> obs(do_GetService("@mozilla.org/observer-service;1"));
   if (obs)
     obs->RemoveObserver(this, "memory-pressure");
+#endif
 
   if (nsnull != mFontCache)
   {
@@ -109,11 +114,16 @@ void DeviceContextImpl :: CommonInit(void)
   for (PRInt32 cnt = 0; cnt < 256; cnt++)
     mGammaTable[cnt] = cnt;
 
+#if 0
+  //XXX temporarily disabled because it causes device context contexts
+  //XXX to hang around until shutdown
+
   // register as a memory-pressure observer to free font resources
   // in low-memory situations.
   nsCOMPtr<nsIObserverService> obs(do_GetService("@mozilla.org/observer-service;1"));
   if (obs)
     obs->AddObserver(this, "memory-pressure", PR_FALSE);
+#endif
 }
 
 NS_IMETHODIMP DeviceContextImpl :: GetTwipsToDevUnits(float &aTwipsToDevUnits) const