diff --git a/debian/changelog b/debian/changelog
index 2272e8b5bd51af50a4381a7592f7637bc1ebbed2..278187a08f39b4cfd049bb9bdef740f396c2bef9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ arm-trusted-firmware (2.7.0+dfsg-2+apertis2) UNRELEASED; urgency=medium
   * Revert passing --param=min-pagesize=0 in CFLAGS.
     This change is required only for gcc-12, since we still use gcc-10
     in Apertis, it fails to build with an "unrecognized command-line option".
+  * Revert Fix build failure by ignoring warnings for RWX segments.
+    This change is required for Apertis and uses another unrecognized
+    arguement.
 
  -- Dylan Aïssi <dylan.aissi@collabora.com>  Fri, 04 Nov 2022 13:52:38 +0100
 
diff --git a/debian/rules b/debian/rules
index f642e39e3ba1152dbc47c6d82fed8b01434f97f0..491c3e469b7ee6652b2255255480c005d57f67df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ define build_platform
 	$(eval subplatforms := $(if $($(platform)_subplatforms), $($(platform)_subplatforms), $(platform)))
 	$(eval target := $(if $(filter rk3328 rk3399,$(platform)),bl31/bl31.elf,bl31.bin))
 	$(foreach subplatform, $(subplatforms), \
-		CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= TF_LDFLAGS=--no-warn-rwx-segments dh_auto_build -- V=$(VERBOSE) DEBUG=$(debug) $($(subplatform)_assigns) PLAT=$(platform) bl31 ; \
+		CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= dh_auto_build -- V=$(VERBOSE) DEBUG=$(debug) $($(subplatform)_assigns) PLAT=$(platform) bl31 ; \
 		install -m644 build/$(platform)/$(buildtype)/$(target) -Dt build/renamed/$(subplatform) ; \
 		# For each subplatform, make is called using the same PLAT variable. If
 		# the build is not cleaned between each call, objects will remain the