fix: Resurrect #1662 #2461

Job	Run time
Build & test (ubuntu-latest, 1.74.0, debug)	11m 27s
Build & test (ubuntu-latest, stable, debug)	12m 16s
Build & test (ubuntu-latest, nightly, debug)	11m 19s
Build & test (macos-14, 1.74.0, debug)	8m 32s
Build & test (macos-14, stable, debug)	7m 14s
Build & test (macos-14, nightly, debug)	7m 8s
Build & test (windows-latest, 1.74.0, debug)	22m 56s
Build & test (windows-latest, stable, debug)	24m 0s
Build & test (windows-latest, nightly, debug)	23m 58s
Build & test (ubuntu-latest, stable, release)	18m 46s
Benchmark / Benchmark	35m 42s
	3h 3m 18s

Provide feedback