Simplify bootstrap patches #4346

Job	Run time
bench	7m 4s
dist (macos-15-intel, x86_64-apple-darwin)	5m 4s
rustfmt	12s
test (ubuntu-latest, s390x-unknown-linux-gnu, gcc-s390x-linux-gnu qemu-user)	5m 25s
dist (ubuntu-22.04, x86_64-unknown-linux-gnu)	2m 58s
dist (ubuntu-24.04-arm, aarch64-unknown-linux-gnu)	2m 24s
test (macos-15-intel, x86_64-apple-darwin)	25m 7s
test_llvm	3m 58s
test (windows-latest, x86_64-pc-windows-msvc)	18m 30s
test (ubuntu-latest, x86_64-unknown-linux-gnu)	12m 7s
test (windows-latest, x86_64-pc-windows-gnu)	24m 34s
test (macos-latest, aarch64-apple-darwin)	20m 19s
dist (windows-latest, x86_64-pc-windows-msvc)	4m 59s
test (ubuntu-24.04-arm, aarch64-unknown-linux-gnu)	9m 22s
dist (macos-latest, aarch64-apple-darwin)	3m 45s
test (ubuntu-latest, riscv64gc-unknown-linux-gnu, gcc-riscv64-linux-gnu qemu-user)	5m 22s
dist (windows-latest, x86_64-pc-windows-gnu)	5m 16s
release	2m 11s
	2h 38m 37s

Provide feedback