Alternative fix proposal for #1832 #2251

Job	Run time
macos-x86_64	45s
linux (i386, i686, i686-linux-gnu, i386-linux-gnu)	1m 21s
linux-x86_64-autotools	1m 48s
linux (armhf, armhf, arm-linux-gnueabihf, arm-linux-gnueabihf)	1m 15s
linux-x86_64	1m 45s
linux (arm64, aarch64, aarch64-linux-gnu, aarch64-linux-gnu)	1m 23s
macos-x86_64_autotools	50s
mingw (mingw64, x86_64)	2m 35s
msvc (x86, Win32)	1m 45s
mingw (ucrt64, ucrt-x86_64)	2m 36s
msvc (x64, x64)	1m 31s
mingw (clang64, clang-x86_64)	2m 5s
msvc (arm64, ARM64)	1m 59s
	21m 38s

Provide feedback