diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 7b55a5d0c066..8b97b5de51df 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -649,4 +649,3 @@ MOZ_EMBEDDING_LEVEL_BASIC = @MOZ_EMBEDDING_LEVEL_BASIC@
 MOZ_EMBEDDING_LEVEL_MINIMAL = @MOZ_EMBEDDING_LEVEL_MINIMAL@
 
 HAVE_ARM_SIMD= @HAVE_ARM_SIMD@
-HAVE_FORCE_ALIGN_ARG_POINTER = @HAVE_FORCE_ALIGN_ARG_POINTER@
diff --git a/configure.in b/configure.in
index 4e6c13b6c4df..9257be32fdc2 100644
--- a/configure.in
+++ b/configure.in
@@ -2949,21 +2949,6 @@ if test "$result" = "yes"; then
 fi
 AC_SUBST(HAVE_ARM_SIMD)
 
-dnl Check for force_align_arg_pointer
-dnl This first appeared in gcc 4.2
-AC_MSG_CHECKING(for __attribute__((__force_align_arg_pointer__)))
-AC_TRY_COMPILE([
-                __attribute__((__force_align_arg_pointer__)) int pixman(int a) { return a; }
-                ],
-                [],
-                result="yes", result="no")
-AC_MSG_RESULT("$result")
-if test "$result" = "yes"; then
-    AC_DEFINE(HAVE_FORCE_ALIGN_ARG_POINTER)
-    HAVE_FORCE_ALIGN_ARG_POINTER=1
-fi
-AC_SUBST(HAVE_FORCE_ALIGN_ARG_POINTER)
-
 dnl Check whether the compiler supports the new-style C++ standard
 dnl library headers (i.e. <new>) or needs the old "new.h"
 AC_LANG_CPLUSPLUS
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index 9ce211fac819..59186f3124bd 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -65,7 +65,7 @@ endif
 ifdef _MSC_VER
 ifeq (86,$(findstring 86,$(OS_TEST)))
 USE_MMX=1
-USE_SSE2=1
+#USE_SSE2=1
 MMX_CFLAGS=
 endif
 endif
@@ -75,10 +75,9 @@ ifdef GNU_CC
 ifeq (86,$(findstring 86,$(OS_TEST)))
 USE_MMX=1
 MMX_CFLAGS=-mmmx -Winline
-ifdef HAVE_FORCE_ALIGN_ARG_POINTER
-USE_SSE2=1
-MMX_CFLAGS+=-msse -msse2
-endif
+# See bug 410509 why we can't use SSE2 yet on linux
+#USE_SSE2=1
+#MMX_CFLAGS+=-msse -msse2
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 MMX_CFLAGS+=--param inline-unit-growth=10000 --param large-function-growth=10000
 endif