D110711 will fix the bug on Windows side and allows me to reland this patch. Also land e5077118 on top of it.
