diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index 237641fbf35..8e14ffc26cc 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -34,7 +34,6 @@ CPPSRCS += yuv_row_mac.cpp \
            $(NULL)
 endif
 
-DEFINES += -D_IMPL_NS_GFX
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/gfx/ycbcr/README b/gfx/ycbcr/README
index 0f6a2586c4a..0bc0ea119bc 100644
--- a/gfx/ycbcr/README
+++ b/gfx/ycbcr/README
@@ -17,4 +17,3 @@ picture_region.patch: Change Chromium code to allow a picture region.
 remove_scale.patch: Removes Chromium scaling code.
 
 yv24.patch: Adds YCbCr 4:4:4 support
-breakage.patch: Export public function to fix seamonkey breakage and fix fast calls on ARM & PPC
diff --git a/gfx/ycbcr/breakage.patch b/gfx/ycbcr/breakage.patch
deleted file mode 100644
index 4e0fcb6d48f..00000000000
--- a/gfx/ycbcr/breakage.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/gfx/ycbcr/yuv_convert.h b/gfx/ycbcr/yuv_convert.h
---- a/gfx/ycbcr/yuv_convert.h
-+++ b/gfx/ycbcr/yuv_convert.h
-@@ -6,6 +6,7 @@
- #define MEDIA_BASE_YUV_CONVERT_H_
- 
- #include "chromium_types.h"
-+#include "gfxCore.h"
- 
- namespace mozilla {
- 
-@@ -21,7 +22,7 @@
- 
- // Convert a frame of YUV to 32 bit ARGB.
- // Pass in YV16/YV12 depending on source format
--void ConvertYCbCrToRGB32(const uint8* yplane,
-+NS_GFX_(void) ConvertYCbCrToRGB32(const uint8* yplane,
-                          const uint8* uplane,
-                          const uint8* vplane,
-                          uint8* rgbframe,
-diff --git a/gfx/ycbcr/yuv_row_linux.cpp b/gfx/ycbcr/yuv_row_linux.cpp
---- a/gfx/ycbcr/yuv_row_linux.cpp
-+++ b/gfx/ycbcr/yuv_row_linux.cpp
-@@ -18,7 +18,7 @@
-                               const uint8* v_buf,
-                               uint8* rgb_buf,
-                               int width) {
--  FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width);
-+  FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width, 1);
- }
-  
- #else
-diff --git a/gfx/ycbcr/yuv_row_mac.cpp b/gfx/ycbcr/yuv_row_mac.cpp
---- a/gfx/ycbcr/yuv_row_mac.cpp
-+++ b/gfx/ycbcr/yuv_row_mac.cpp
-@@ -15,7 +15,7 @@
-                               const uint8* v_buf,
-                               uint8* rgb_buf,
-                               int width) {
--  FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width);
-+  FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width, 1);
- }
-  
- #else
diff --git a/gfx/ycbcr/update.sh b/gfx/ycbcr/update.sh
index 1178dbfbfb7..a726821c07b 100644
--- a/gfx/ycbcr/update.sh
+++ b/gfx/ycbcr/update.sh
@@ -10,4 +10,3 @@ patch -p3 <convert.patch
 patch -p3 <picture_region.patch
 patch -p3 <remove_scale.patch
 patch -p3 <yv24.patch
-patch -p3 <breakage.patch
diff --git a/gfx/ycbcr/yuv_convert.h b/gfx/ycbcr/yuv_convert.h
index 5f6a87f99be..15fe3811814 100644
--- a/gfx/ycbcr/yuv_convert.h
+++ b/gfx/ycbcr/yuv_convert.h
@@ -6,7 +6,6 @@
 #define MEDIA_BASE_YUV_CONVERT_H_
 
 #include "chromium_types.h"
-#include "gfxCore.h"
 
 namespace mozilla {
 
@@ -22,7 +21,7 @@ enum YUVType {
 
 // Convert a frame of YUV to 32 bit ARGB.
 // Pass in YV16/YV12 depending on source format
-NS_GFX_(void) ConvertYCbCrToRGB32(const uint8* yplane,
+void ConvertYCbCrToRGB32(const uint8* yplane,
                          const uint8* uplane,
                          const uint8* vplane,
                          uint8* rgbframe,