This reverts commit eaa52b5baa8fbb26a79890561d0c40344d1e1bf3, which would lead to build failures on systems other than x86_64-linux.
This reverts commit eaa52b5baa8fbb26a79890561d0c40344d1e1bf3, which would lead to build failures on systems other than x86_64-linux.