This reverts commit 9497c734. This reverts commit c55337f2. This causes other build failures on some environments. Turns out, this was not even enough to get gcc to fully build on my environment, so more fixes are needed.
