revert move #3685

Job	Run time
clang-sanitizers (,thread)	18m 21s
byo-crypto	2m 50s
linux-compat (manylinux1-x64)	16m 43s
clang-sanitizers (,address,undefined)	16m 41s
linux-compat (manylinux1-x86)	17m 36s
downstream	15m 36s
linux-compat (manylinux2014-x64)	15m 16s
linux-compat (manylinux2014-x86)	16m 54s
linux-debug	16m 58s
linux-shared-libs	16m 59s
linux-compiler-compat (clang-3)	16m 36s
linux-compat (al2-x64)	15m 50s
linux-compiler-compat (clang-6)	17m 35s
linux-compiler-compat (clang-8)	18m 24s
macos-x64	18m 35s
linux-compiler-compat (clang-9)	17m 18s
macos	16m 22s
windows	18m 38s
linux-compiler-compat (clang-10)	17m 17s
linux-compiler-compat (clang-11)	17m 20s
windows-app-verifier	29m 53s
linux-compiler-compat (gcc-4.8)	16m 15s
windows-shared-libs	16m 3s
windows-vc14 (x86)	14m 56s
linux-compiler-compat (gcc-5)	15m 54s
windows-vc14 (x64)	16m 58s
linux-compiler-compat (gcc-6)	15m 45s
linux-compiler-compat (gcc-7)	16m 2s
linux-compiler-compat (gcc-8)	16m 47s
	8h 6m 22s

Provide feedback