Revert 5547 and 5580 #3147

Job	Run time
Windows (Debug, MSVC, Win32)	15m 50s
Windows (Debug, MSVC, x64)	15m 35s
Mac (Debug, clang, x86_64)	15m 50s
Linux (Debug, gcc-5)	8m 21s
Windows (Release, MSVC, Win32)	24m 27s
Mac (Release, clang, x86_64)	14m 9s
Linux (Debug, gcc-10)	10m 23s
Windows (Release, MSVC, x64)	26m 22s
Linux (Debug, clang-9)	12m 37s
Linux (Release, gcc-5)	7m 17s
Linux (Release, gcc-10)	7m 56s
Linux (Release, clang-9)	11m 49s
Linux (Debug, gcc-10, -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF)	11m 32s
Linux (Release, gcc-10, -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF)	8m 4s
	3h 10m 12s

Provide feedback