Revert "Fix static linking with GCC-10"