On a second look, something got broken over time here. I'd like to fix this bit separately from the Windows patches.