This reverts commit befa77e5. Looks like this broke a SymbolFileNativePDB test. I'll investigate and resubmit with a fix soon.