diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index 68c0aa5e1b..7d11ec2d3e 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1296,17 +1296,17 @@ fn assert_instruction_count() {
     {
         programs.extend_from_slice(&[
             ("solana_bpf_rust_128bit", 584),
-            ("solana_bpf_rust_alloc", 7890),
+            ("solana_bpf_rust_alloc", 7082),
             ("solana_bpf_rust_dep_crate", 2),
-            ("solana_bpf_rust_external_spend", 508),
+            ("solana_bpf_rust_external_spend", 504),
             ("solana_bpf_rust_iter", 724),
             ("solana_bpf_rust_many_args", 233),
-            ("solana_bpf_rust_mem", 3095),
-            ("solana_bpf_rust_membuiltins", 4012),
-            ("solana_bpf_rust_noop", 482),
+            ("solana_bpf_rust_mem", 3117),
+            ("solana_bpf_rust_membuiltins", 4065),
+            ("solana_bpf_rust_noop", 478),
             ("solana_bpf_rust_param_passing", 46),
             ("solana_bpf_rust_sanity", 900),
-            ("solana_bpf_rust_sha", 28877),
+            ("solana_bpf_rust_sha", 28795),
         ]);
     }
 
diff --git a/sdk/bpf/env.sh b/sdk/bpf/env.sh
index 8c15625871..8dfb02464d 100644
--- a/sdk/bpf/env.sh
+++ b/sdk/bpf/env.sh
@@ -15,4 +15,4 @@ export AR="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-ar"
 export OBJDUMP="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objdump"
 export OBJCOPY="$bpf_sdk/dependencies/bpf-tools/llvm/bin/llvm-objcopy"
 
-export RUSTFLAGS="-C lto=no -C opt-level=2"
+export RUSTFLAGS="-C lto=no"
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index d4d87b6839..7b43c7a755 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -277,9 +277,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
     env::set_var("AR", llvm_bin.join("llvm-ar"));
     env::set_var("OBJDUMP", llvm_bin.join("llvm-objdump"));
     env::set_var("OBJCOPY", llvm_bin.join("llvm-objcopy"));
-    let mut rust_flags = String::from("-C lto=no");
-    rust_flags.push_str(" -C opt-level=2");
-    env::set_var("RUSTFLAGS", rust_flags);
+    env::set_var("RUSTFLAGS", "-C lto=no");
     let cargo_build = PathBuf::from("cargo");
     let mut cargo_build_args = vec![
         "+bpf",