fix: Resurrect #1662 #2056

Job	Run time
Build & test (ubuntu-latest, 1.74.0, debug)	8m 40s
Build & test (ubuntu-latest, stable, debug)	7m 53s
Build & test (ubuntu-latest, nightly, debug)	7m 13s
Build & test (macos-14, 1.74.0, debug)	8m 5s
Build & test (macos-14, stable, debug)	22m 54s
Build & test (macos-14, nightly, debug)	8m 48s
Build & test (windows-latest, 1.74.0, debug)	17m 34s
Build & test (windows-latest, stable, debug)	16m 9s
Build & test (windows-latest, nightly, debug)	15m 3s
Build & test (ubuntu-latest, stable, release)	13m 55s
Benchmark	0s
	2h 6m 14s

Provide feedback