This reverts commit cc90ca6f. This still breaks the GCC build in the same way as the previous version.