diff --git a/redhat-hardened-cc1 b/redhat-hardened-cc1
index 4d1bf59..47b4792 100644
--- a/redhat-hardened-cc1
+++ b/redhat-hardened-cc1
@@ -1,4 +1,2 @@
-%rename cc1_options rh_cc1_options_old
-
 *cc1_options:
-%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}} %(rh_cc1_options_old)
++ %{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}
diff --git a/redhat-hardened-ld b/redhat-hardened-ld
index b26049c..4e407b3 100644
--- a/redhat-hardened-ld
+++ b/redhat-hardened-ld
@@ -1,9 +1,5 @@
-%rename self_spec rh_self_spec_old
-
 *self_spec:
-%{!shared:-pie} %(rh_self_spec_old)
-
-%rename link rh_link_old
++ %{!shared:-pie}
 
 *link:
--z now %(rh_link_old)
++ -z now