diff --git a/config/bootstrap-lto-locality.mk b/config/bootstrap-lto-locality.mk
index b31565c4c52..6d359b70058 100644
--- a/config/bootstrap-lto-locality.mk
+++ b/config/bootstrap-lto-locality.mk
@@ -2,8 +2,8 @@
 
 STAGE2_CFLAGS += -flto=jobserver -frandom-seed=1 -fipa-reorder-for-locality
 STAGE3_CFLAGS += -flto=jobserver -frandom-seed=1 -fipa-reorder-for-locality
-STAGEprofile_CFLAGS += -flto=jobserver -frandom-seed=1 -fipa-reorder-for-locality
-STAGEtrain_CFLAGS += -flto=jobserver -frandom-seed=1 -fipa-reorder-for-locality
+STAGEprofile_CFLAGS += -flto=jobserver -frandom-seed=1
+STAGEtrain_CFLAGS += -flto=jobserver -frandom-seed=1
 STAGEfeedback_CFLAGS += -flto=jobserver -frandom-seed=1 -fipa-reorder-for-locality
 
 # assumes the host supports the linker plugin
diff --git a/gcc/params.opt b/gcc/params.opt
index 921d143f517..5506bc0e462 100644
--- a/gcc/params.opt
+++ b/gcc/params.opt
@@ -517,7 +517,7 @@ Common Joined UInteger Var(param_lto_locality_size) Init(1000) IntegerRange(1, 6
 Size cut-off for callee including inlined calls to be cloned for a particular caller.
 
 -param=lto-max-locality-partition=
-Common Joined UInteger Var(param_max_locality_partition_size) Init(1000000) Param
+Common Joined UInteger Var(param_max_locality_partition_size) Init(500000) Param
 Maximal size of a locality partition for LTO (in estimated instructions). Value of 0 results in default value being used.
 
 Enum