diff --git a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
index 3972baae829..4dcd9738314 100644
--- a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -142,18 +142,8 @@ NS_IMETHODIMP nsGIFDecoder2::Init(imgILoad *aLoad)
 {
   mObserver = do_QueryInterface(aLoad);
 
-  /* The image container may already exist if it is reloading itself from us.
-   */
-  aLoad->GetImage(getter_AddRefs(mImageContainer));
-  if (!mImageContainer) {
-    mImageContainer = do_CreateInstance("@mozilla.org/image/container;1");
-    if (!mImageContainer)
-      return NS_ERROR_OUT_OF_MEMORY;
-      
-    aLoad->SetImage(mImageContainer);
-    nsresult rv = mImageContainer->SetDiscardable("image/gif");
-    NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
-  }
+  mImageContainer = do_CreateInstance("@mozilla.org/image/container;1");
+  aLoad->SetImage(mImageContainer);
   
   // Start with the version (GIF89a|GIF87a)
   mGIFStruct.state = gif_type;
@@ -184,7 +174,7 @@ NS_IMETHODIMP nsGIFDecoder2::Close()
 /* void flush (); */
 NS_IMETHODIMP nsGIFDecoder2::Flush()
 {
-  return NS_OK;
+    return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 //******************************************************************************
@@ -197,7 +187,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
                              PRUint32 *writeCount)
 {
   nsGIFDecoder2 *decoder = static_cast<nsGIFDecoder2*>(closure);
-  nsresult rv = decoder->ProcessData(fromRawSegment, count, writeCount);
+  nsresult rv = decoder->ProcessData((unsigned char*)fromRawSegment, count, writeCount);
   if (NS_FAILED(rv)) {
     *writeCount = 0;
     return rv;
@@ -246,11 +236,11 @@ nsGIFDecoder2::FlushImageData()
 }
 
 //******************************************************************************
-nsresult nsGIFDecoder2::ProcessData(const char *data, PRUint32 count, PRUint32 *_retval)
+nsresult nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count, PRUint32 *_retval)
 {
   // Push the data to the GIF decoder
   
-  nsresult rv = GifWrite((const PRUint8*)data, count);
+  nsresult rv = GifWrite(data, count);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Flushing is only needed for first frame
@@ -260,13 +250,6 @@ nsresult nsGIFDecoder2::ProcessData(const char *data, PRUint32 count, PRUint32 *
     mLastFlushedPass = mCurrentPass;
   }
 
-  // We should just disable the 'restore' when AddRestoreData fails, so that we still load the image...
-  rv = mImageContainer->AddRestoreData(data, count);
-  if (NS_FAILED(rv)) { 
-    mGIFStruct.state = gif_oom;
-    return rv;
-  }
-    
   *_retval = count;
 
   return NS_OK;
@@ -327,7 +310,6 @@ void nsGIFDecoder2::EndGIF()
   
   mImageContainer->SetLoopCount(mGIFStruct.loop_count);
   mImageContainer->DecodingComplete();
-  (void)mImageContainer->RestoreDataDone(); // Discard error code
 
   mGIFOpen = PR_FALSE;
 }
diff --git a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h
index 2c43bed1f0a..570cca2e1f5 100644
--- a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h
+++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h
@@ -68,7 +68,7 @@ public:
   nsGIFDecoder2();
   ~nsGIFDecoder2();
   
-  nsresult ProcessData(const char *data, PRUint32 count, PRUint32 *_retval);
+  nsresult ProcessData(unsigned char *data, PRUint32 count, PRUint32 *_retval);
 
 private:
   /* These functions will be called when the decoder has a decoded row,