This reverts commit 7ca86ee6. Apparently this change causes MS link.exe to error out with "LNK1235: corrupt or invalid COFF symbol table".