This reverts commit fda29264. This breaks the sanitizer build on windows, will reapply with additional changes.