diff --git a/linker/Android.bp b/linker/Android.bp
index 50587f2..b6fcf49 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -104,9 +104,7 @@
             version_script: "linker.generic.map",
         },
         x86: {
-            srcs: ["arch/x86/begin.c"],
-
-            cflags: ["-D__work_around_b_24465209__"],
+            srcs: ["arch/x86/begin.S"],
             version_script: "linker.generic.map",
         },
         x86_64: {